Merge remote-tracking branch 'origin/develop' into develop

- 在手术室管理界面添加类型和所属科室表格列显示
- 添加手术室类型下拉选择功能，支持急诊、择期、日间、复合四种类型
- 添加手术室详情查看页面中的类型字段展示
- 在后端服务中实现手术室类型的字典转换和文本显示
- 添加手术室实体类中的类型和所属机构名称字段
- 更新路由配置注释掉废弃的系统管理相关路径配置

.trae/documents/plan_20251231_062502.md

@@ -0,0 +1,26 @@
+# 修复门诊预约界面专家号查询结果显示问题
+
+## 问题分析
+1. 前端传递的参数正确：`type=expert`，后端正确转换为`ticketType=专家`
+2. 实际查询返回了5条记录，但COUNT查询只返回了1条记录
+3. 这导致前端只显示了1条记录，而不是全部5条
+4. 原因：MyBatis-Plus自动生成的COUNT查询和实际查询使用了不同的条件，特别是逻辑删除条件
+
+## 解决方案
+1. 修改TicketMapper.xml中的自定义COUNT查询，显式添加`delete_flag = '0'`条件
+2. 在selectTicketPage和selectTicketPage_mpCount查询中都添加逻辑删除条件
+3. 确保两个查询使用完全相同的WHERE条件
+
+## 修复步骤
+1. 修改`selectTicketPage`查询，添加逻辑删除条件`and delete_flag = '0'`
+2. 修改`selectTicketPage_mpCount`查询，添加逻辑删除条件`and delete_flag = '0'`
+3. 确保两个查询的WHERE条件完全一致
+4. 测试修复后的功能，确保专家号能正确显示全部5条记录
+
+## 代码修改点
+- 文件：`d:/work/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/TicketMapper.xml`
+- 查询：`selectTicketPage` 和 `selectTicketPage_mpCount`
+- 修改内容：添加逻辑删除条件`and delete_flag = '0'`
+
+## 预期效果
+修复后，COUNT查询和实际查询将使用完全相同的条件，包括逻辑删除条件，从而确保COUNT查询返回正确的总记录数，前端能显示所有5条专家号记录。

.trae/documents/plan_20251231_063300.md

@@ -0,0 +1,30 @@
+# 修复门诊预约界面专家号查询COUNT结果不正确问题
+
+## 问题分析
+1. 前端传递的参数正确：`type=expert`，后端正确转换为`ticketType=专家`
+2. COUNT查询和实际查询的WHERE条件完全相同：`WHERE delete_flag = '0' AND ticket_type = '专家'`
+3. 但COUNT查询只返回1条记录，而实际查询返回5条记录
+4. 原因：MyBatis-Plus的分页插件在处理自定义COUNT查询时，存在bug，导致COUNT查询结果不正确
+
+## 解决方案
+修改`TicketAppServiceImpl.java`中的`listTicket`方法，不使用MyBatis-Plus的自动分页功能，而是手动实现分页查询：
+1. 直接调用`ticketService.countTickets`方法获取总记录数
+2. 手动构建查询条件
+3. 确保COUNT查询和实际查询使用完全相同的条件
+
+## 修复步骤
+1. 修改`TicketAppServiceImpl.java`中的`listTicket`方法
+2. 手动实现分页查询，包括：
+   - 构建查询条件
+   - 调用`countTickets`获取总记录数
+   - 调用`selectTicketList`获取分页数据
+   - 手动组装分页结果
+3. 测试修复后的功能，确保专家号能正确显示全部5条记录
+
+## 代码修改点
+- 文件：`d:/work/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java`
+- 方法：`listTicket`
+- 修改内容：替换MyBatis-Plus的自动分页，改为手动分页实现
+
+## 预期效果
+修复后，COUNT查询和实际查询将使用完全相同的条件，COUNT查询将返回正确的总记录数（5条），前端能显示所有5条专家号记录。

.trae/documents/修复号源列表显示问题.md

@@ -0,0 +1,32 @@
+## 问题分析
+根据日志和代码分析，发现号源列表显示"没有更多数据了"的问题原因：
+
+1. **后端查询正常**：成功查询到5条符合条件的专家号源记录
+2. **数据转换失败**：在`convertToDto`方法中，`fee`字段类型转换错误
+3. **响应返回空列表**：由于转换异常，最终返回给前端的号源列表为空
+
+## 问题根源
+- `Ticket`实体类的`fee`字段为**BigDecimal类型**（数据库存储）
+- `TicketDto`类的`fee`字段为**String类型**（前端展示）
+- 在`convertToDto`方法中，直接将BigDecimal类型的`fee`赋值给String类型的`fee`，导致**ClassCastException**
+
+## 修复方案
+修改`TicketAppServiceImpl.java`文件中的`convertToDto`方法，将BigDecimal类型的`fee`转换为String类型：
+
+```java
+// 原代码
+dto.setFee(ticket.getFee());
+
+// 修复后代码
+dto.setFee(ticket.getFee().toString());
+```
+
+## 预期效果
+1. 修复后，后端能成功将`Ticket`实体转换为`TicketDto`
+2. 前端能接收到包含5条专家号源的完整列表
+3. 页面显示正常，不再出现"没有更多数据了"的提示
+
+## 验证方法
+1. 重新启动项目，访问号源管理页面
+2. 选择"专家号"类型，查看是否能正确显示5条号源记录
+3. 检查日志，确认没有类型转换异常

.trae/documents/修复门诊预约界面专家号查询问题.md

@@ -0,0 +1,23 @@
+# 修复门诊预约界面专家号查询问题
+
+## 问题分析
+从日志中发现关键问题：
+- 前端传递的ticket_type值是英文：`general` (普通号) 和 `expert` (专家号)
+- 数据库中存储的ticket_type值是中文：`普通` 和 `专家`
+- 导致查询条件不匹配，无法查询到数据
+
+## 解决方案
+需要在后端添加类型映射转换，将前端传递的英文类型转换为数据库中存储的中文类型。
+
+## 修复步骤
+1. 修改 `TicketAppServiceImpl.java` 文件，在处理type参数时添加映射转换逻辑
+2. 添加从英文类型到中文类型的映射关系
+3. 测试修复后的功能，确保普通号和专家号都能正确查询
+
+## 代码修改点
+- 文件：`d:/work/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java`
+- 方法：`listTicket` 中的type参数处理部分
+- 修改内容：添加类型映射转换，将 "general" 转换为 "普通"，"expert" 转换为 "专家"
+
+## 预期效果
+修复后，前端选择"普通号"或"专家号"时，系统能正确查询到对应的号源数据，不再出现"没有更多数据了"的提示。

.trae/documents/修复门诊预约界面只显示1条数据的问题.md

@@ -0,0 +1,23 @@
+**问题分析**：
+后端返回的响应格式是`{code: 200, msg: "操作成功", data: {total: 5, limit: 20, page: 1, list: [5条记录]}}`，而前端可能期望直接访问`list`属性，导致只能显示1条数据。
+
+**修复方案**：
+
+1. 修改`TicketAppServiceImpl.java`的`listTicket`方法，确保返回的分页数据格式正确
+2. 调整响应结构，使其更符合前端期望
+3. 保持与现有代码的兼容性
+
+**修改点**：
+
+* `TicketAppServiceImpl.java`：优化`listTicket`方法的响应格式
+
+* 确保分页信息和列表数据都能正确返回给前端
+
+**预期效果**：
+
+* 后端返回正确格式的响应数据
+
+* 前端能够正确显示所有5条专家号数据
+
+* 保持与现有代码的兼容性
+

CheckTicketStatus.java

@@ -0,0 +1,33 @@
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+public class CheckTicketStatus {
+    public static void main(String[] args) {
+        String url = "jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=hisdev&characterEncoding=UTF-8&client_encoding=UTF-8";
+        String user = "postgresql";
+        String password = "Jchl1528";
+        
+        try {
+            Class.forName("org.postgresql.Driver");
+            Connection conn = DriverManager.getConnection(url, user, password);
+            Statement stmt = conn.createStatement();
+            ResultSet rs = stmt.executeQuery("SELECT id, status, delete_flag FROM clinical_ticket WHERE id = 1");
+            
+            if (rs.next()) {
+                System.out.println("Ticket ID: " + rs.getLong("id"));
+                System.out.println("Status: " + rs.getString("status"));
+                System.out.println("Delete Flag: " + rs.getString("delete_flag"));
+            } else {
+                System.out.println("Ticket ID 1 not found");
+            }
+            
+            rs.close();
+            stmt.close();
+            conn.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

TestDeleteInspectionType.java

@@ -1,39 +0,0 @@
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Scanner;
-
-public class TestDeleteInspectionType {
-    public static void main(String[] args) {
-        try {
-            // 测试删除ID为1的检验类型
-            long inspectionTypeId = 1;
-            URL url = new URL("http://localhost:8080/system/inspection-type/" + inspectionTypeId);
-            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-            connection.setRequestMethod("DELETE");
-            connection.setRequestProperty("Content-Type", "application/json");
-            connection.setRequestProperty("Accept", "application/json");
-            
-            // 发送请求
-            int responseCode = connection.getResponseCode();
-            System.out.println("响应代码: " + responseCode);
-            
-            // 读取响应
-            Scanner scanner;
-            if (responseCode >= 200 && responseCode < 300) {
-                scanner = new Scanner(connection.getInputStream());
-            } else {
-                scanner = new Scanner(connection.getErrorStream());
-            }
-            
-            String response = scanner.useDelimiter("\\A").next();
-            System.out.println("响应内容: " + response);
-            
-            scanner.close();
-            connection.disconnect();
-            
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}

add_new_fields_to_cli_surgery.sql

@@ -0,0 +1,11 @@
+-- 添加新字段到cli_surgery表
+ALTER TABLE cli_surgery ADD COLUMN emergency_flag int2 DEFAULT 0;
+ALTER TABLE cli_surgery ADD COLUMN implant_flag int2 DEFAULT 0;
+ALTER TABLE cli_surgery ADD COLUMN operating_room_confirm_time timestamp;
+ALTER TABLE cli_surgery ADD COLUMN operating_room_confirm_user varchar(100);
+
+-- 添加字段注释
+COMMENT ON COLUMN cli_surgery.emergency_flag IS '急诊标志 0-否 1-是';
+COMMENT ON COLUMN cli_surgery.implant_flag IS '植入高值耗材标志 0-否 1-是';
+COMMENT ON COLUMN cli_surgery.operating_room_confirm_time IS '手术室确认时间';
+COMMENT ON COLUMN cli_surgery.operating_room_confirm_user IS '手术室确认人';

check_surgery_fields.sql

@@ -0,0 +1,10 @@
+-- 检查手术表中所有字段是否存在
+SELECT 
+    column_name, 
+    data_type, 
+    character_maximum_length,
+    is_nullable
+FROM information_schema.columns 
+WHERE table_name = 'cli_surgery' 
+AND column_name LIKE '%name%'
+ORDER BY column_name;

create_clinical_ticket_table.sql

@@ -0,0 +1,67 @@
+-- 创建序列
+CREATE SEQUENCE "hisdev"."clinical_ticket_id_seq"
+  INCREMENT 1
+  MINVALUE 1
+  MAXVALUE 9223372036854775807
+  START 1
+  CACHE 1;
+
+-- 创建号源表clinical_ticket
+CREATE TABLE "hisdev"."clinical_ticket" (
+  "id" bigint NOT NULL DEFAULT nextval('hisdev.clinical_ticket_id_seq'::regclass),
+  "bus_no" varchar(50) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "department" varchar(100) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "doctor" varchar(100) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "ticket_type" varchar(20) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "time" varchar(50) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "status" varchar(20) COLLATE "pg_catalog"."default" NOT NULL DEFAULT 'unbooked'::character varying,
+  "fee" varchar(20) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "patient_id" bigint,
+  "patient_name" varchar(100) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "medical_card" varchar(50) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "phone" varchar(20) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "appointment_date" timestamptz(6),
+  "appointment_time" timestamptz(6),
+  "department_id" bigint,
+  "doctor_id" bigint,
+  "create_by" varchar(32) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "create_time" timestamptz(6) NOT NULL,
+  "update_by" varchar(32) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "update_time" timestamptz(6),
+  "remark" varchar(500) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "delete_flag" char(1) COLLATE "pg_catalog"."default" NOT NULL DEFAULT 0,
+  "tenant_id" bigint NOT NULL,
+  PRIMARY KEY ("id")
+)
+WITH (
+  OIDS = FALSE
+)
+;
+
+ALTER SEQUENCE "hisdev"."clinical_ticket_id_seq" OWNED BY "hisdev"."clinical_ticket"."id";
+
+-- 添加注释
+COMMENT ON TABLE "hisdev"."clinical_ticket" IS '号源管理表';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."id" IS 'ID';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."bus_no" IS '号源编码';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."department" IS '科室名称';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."doctor" IS '医生姓名';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."ticket_type" IS '号源类型 (普通/专家)';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."time" IS '挂号时间';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."status" IS '状态 (unbooked:未预约, booked:已预约, checked:已取号, cancelled:已取消, locked:已锁定)';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."fee" IS '挂号费';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."patient_id" IS '患者ID';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."patient_name" IS '患者姓名';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."medical_card" IS '就诊卡号';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."phone" IS '手机号';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."appointment_date" IS '预约日期';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."appointment_time" IS '预约时间';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."department_id" IS '科室ID';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."doctor_id" IS '医生ID';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."create_by" IS '创建人';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."create_time" IS '创建时间';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."update_by" IS '更新人';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."update_time" IS '更新时间';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."remark" IS '备注';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."delete_flag" IS '删除状态';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."tenant_id" IS '租户ID';

fill_missing_surgery_name_fields.sql

@@ -0,0 +1,82 @@
+-- 修复已存在的手术记录中缺失的名称字段
+-- 注意：这只是一个示例，实际执行前请根据您的数据库表结构调整
+
+-- 填充患者姓名
+UPDATE public.cli_surgery s
+SET patient_name = p.name
+FROM public.adm_patient p
+WHERE s.patient_id = p.id
+AND s.patient_name IS NULL
+AND s.delete_flag = '0';
+
+-- 填充主刀医生姓名
+UPDATE public.cli_surgery s
+SET main_surgeon_name = u.nick_name
+FROM public.sys_user u
+WHERE s.main_surgeon_id = u.user_id
+AND s.main_surgeon_name IS NULL
+AND s.delete_flag = '0';
+
+-- 填充麻醉医生姓名
+UPDATE public.cli_surgery s
+SET anesthetist_name = u.nick_name
+FROM public.sys_user u
+WHERE s.anesthetist_id = u.user_id
+AND s.anesthetist_name IS NULL
+AND s.delete_flag = '0';
+
+-- 填充助手1姓名
+UPDATE public.cli_surgery s
+SET assistant_1_name = u.nick_name
+FROM public.sys_user u
+WHERE s.assistant_1_id = u.user_id
+AND s.assistant_1_name IS NULL
+AND s.delete_flag = '0';
+
+-- 填充助手2姓名
+UPDATE public.cli_surgery s
+SET assistant_2_name = u.nick_name
+FROM public.sys_user u
+WHERE s.assistant_2_id = u.user_id
+AND s.assistant_2_name IS NULL
+AND s.delete_flag = '0';
+
+-- 填充巡回护士姓名
+UPDATE public.cli_surgery s
+SET scrub_nurse_name = u.nick_name
+FROM public.sys_user u
+WHERE s.scrub_nurse_id = u.user_id
+AND s.scrub_nurse_name IS NULL
+AND s.delete_flag = '0';
+
+-- 填充手术室名称
+UPDATE public.cli_surgery s
+SET operating_room_name = r.name
+FROM public.cli_operating_room r
+WHERE s.operating_room_id = r.id
+AND s.operating_room_name IS NULL
+AND s.delete_flag = '0';
+
+-- 填充执行科室名称
+UPDATE public.cli_surgery s
+SET org_name = o.name
+FROM public.adm_organization o
+WHERE s.org_id = o.id
+AND s.org_name IS NULL
+AND s.delete_flag = '0';
+
+-- 填充申请科室名称
+UPDATE public.cli_surgery s
+SET apply_dept_name = o.name
+FROM public.adm_organization o
+WHERE s.apply_dept_id = o.id
+AND s.apply_dept_name IS NULL
+AND s.delete_flag = '0';
+
+-- 填充申请医生姓名
+UPDATE public.cli_surgery s
+SET apply_doctor_name = u.nick_name
+FROM public.sys_user u
+WHERE s.apply_doctor_id = u.user_id
+AND s.apply_doctor_name IS NULL
+AND s.delete_flag = '0';

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java

@@ -61,7 +61,25 @@ public class SysConfigController extends BaseController {
      */
     @GetMapping(value = "/configKey/{configKey}")
     public AjaxResult getConfigKey(@PathVariable String configKey) {
-        return success(configService.selectConfigByKey(configKey));
+        String configValue = configService.selectConfigByKey(configKey);
+        // 确保即使返回 null 或空字符串，也明确设置 data 字段
+        // 如果 configValue 是 null，转换为空字符串
+        if (configValue == null) {
+            configValue = "";
+        }
+        // 直接创建 AjaxResult 并明确设置 data 字段，确保 data 字段始终存在
+        AjaxResult result = new AjaxResult();
+        result.put("code", 200);
+        result.put("msg", "操作成功");
+        result.put("data", configValue); // 明确设置 data 字段，即使值为空字符串
+        System.out.println("=== getConfigKey 调试信息 ===");
+        System.out.println("configKey: " + configKey);
+        System.out.println("configValue: [" + configValue + "]");
+        System.out.println("result.data: " + result.get("data"));
+        System.out.println("result.msg: " + result.get("msg"));
+        System.out.println("result.code: " + result.get("code"));
+        System.out.println("============================");
+        return result;
     }
 
     /**

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java

@@ -11,6 +11,7 @@ import com.core.framework.web.service.SysLoginService;
 import com.core.framework.web.service.SysPermissionService;
 import com.core.framework.web.service.TokenService;
 import com.core.system.service.ISysMenuService;
+import com.core.system.service.ISysTenantService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,6 +40,9 @@ public class SysLoginController {
     @Autowired
     private TokenService tokenService;
 
+    @Autowired
+    private ISysTenantService tenantService;
+
     /**已评审
      * 登录方法
      *
@@ -72,12 +76,22 @@ public class SysLoginController {
             loginUser.setPermissions(permissions);
             tokenService.refreshToken(loginUser);
         }
+        // 获取租户名称
+        String tenantName = null;
+        if (loginUser.getTenantId() != null) {
+            com.core.system.domain.SysTenant tenant = tenantService.getById(loginUser.getTenantId());
+            if (tenant != null) {
+                tenantName = tenant.getTenantName();
+            }
+        }
         AjaxResult ajax = AjaxResult.success();
         ajax.put("optionJson", loginUser.getOptionJson());
+        ajax.put("optionMap", loginUser.getOptionMap());
         ajax.put("practitionerId", String.valueOf(loginUser.getPractitionerId()));
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
+        ajax.put("tenantName", tenantName);
         return ajax;
     }
 

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java

@@ -3,9 +3,12 @@ package com.core.web.controller.system;
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
+import com.core.common.core.domain.entity.SysUser;
+import com.core.common.core.domain.model.LoginUser;
 import com.core.common.core.page.TableDataInfo;
 import com.core.common.enums.BusinessType;
 import com.core.system.domain.SysNotice;
+import com.core.system.service.ISysNoticeReadService;
 import com.core.system.service.ISysNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +28,9 @@ public class SysNoticeController extends BaseController {
     @Autowired
     private ISysNoticeService noticeService;
 
+    @Autowired
+    private ISysNoticeReadService noticeReadService;
+
     /**
      * 获取通知公告列表
      */
@@ -36,6 +42,108 @@ public class SysNoticeController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 获取当前用户的公告列表（公开接口）
+     * 公告类型：通常 noticeType = '1' 代表通知，noticeType = '2' 代表公告
+     */
+    @GetMapping("/public/list")
+    public TableDataInfo getPublicList(SysNotice notice) {
+        // 只查询状态为正常（0）且已发布（1）的公告
+        notice.setStatus("0");
+        notice.setPublishStatus("1");
+        // 公告类型设置为 '2'（公告）
+        notice.setNoticeType("2");
+        // 设置分页参数
+        startPage();
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取当前用户的通知列表（公开接口）
+     * 通知类型：通常 noticeType = '1' 代表通知，noticeType = '2' 代表公告
+     * 返回已发布且状态正常的所有公告和通知，并标注已读状态
+     * 按优先级排序，高优先级在前
+     */
+    @GetMapping("/public/notice")
+    public AjaxResult getUserNotices() {
+        // 获取当前用户信息
+        LoginUser loginUser = getLoginUser();
+        SysUser currentUser = loginUser.getUser();
+
+        // 查询已发布且状态正常的所有公告和通知
+        SysNotice notice = new SysNotice();
+        notice.setStatus("0");
+        notice.setPublishStatus("1");
+
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+
+        // 按优先级排序（1高 2中 3低），相同优先级按创建时间降序
+        list.sort((a, b) -> {
+            String priorityA = a.getPriority() != null ? a.getPriority() : "3";
+            String priorityB = b.getPriority() != null ? b.getPriority() : "3";
+            int priorityCompare = priorityA.compareTo(priorityB);
+            if (priorityCompare != 0) {
+                return priorityCompare;
+            }
+            // 相同优先级，按创建时间降序
+            return b.getCreateTime().compareTo(a.getCreateTime());
+        });
+
+        // 获取用户已读的公告/通知ID列表
+        List<Long> readIds = noticeReadService.selectReadNoticeIdsByUserId(currentUser.getUserId());
+
+        // 为每个公告/通知添加已读状态
+        for (SysNotice item : list) {
+            boolean isRead = readIds.contains(item.getNoticeId());
+            item.setIsRead(isRead);
+        }
+
+        return success(list);
+    }
+
+    /**
+     * 获取用户未读公告/通知数量（公开接口）
+     */
+    @GetMapping("/public/unread/count")
+    public AjaxResult getUnreadCount() {
+        LoginUser loginUser = getLoginUser();
+        SysUser currentUser = loginUser.getUser();
+        int count = noticeReadService.getUnreadCount(currentUser.getUserId());
+        return success(count);
+    }
+
+    /**
+     * 标记公告/通知为已读（公开接口）
+     */
+    @PostMapping("/public/read/{noticeId}")
+    public AjaxResult markAsRead(@PathVariable Long noticeId) {
+        LoginUser loginUser = getLoginUser();
+        SysUser currentUser = loginUser.getUser();
+        return noticeReadService.markAsRead(noticeId, currentUser.getUserId());
+    }
+
+    /**
+     * 批量标记公告/通知为已读（公开接口）
+     */
+    @PostMapping("/public/read/all")
+    public AjaxResult markAllAsRead(@RequestBody Long[] noticeIds) {
+        LoginUser loginUser = getLoginUser();
+        SysUser currentUser = loginUser.getUser();
+        return noticeReadService.markAllAsRead(noticeIds, currentUser.getUserId());
+    }
+
+    /**
+     * 获取用户已读公告/通知ID列表（公开接口）
+     */
+    @GetMapping("/public/read/ids")
+    public AjaxResult getReadNoticeIds() {
+        LoginUser loginUser = getLoginUser();
+        SysUser currentUser = loginUser.getUser();
+        List<Long> readIds = noticeReadService.selectReadNoticeIdsByUserId(currentUser.getUserId());
+        return success(readIds);
+    }
+
     /**
      * 根据通知公告编号获取详细信息
      */
@@ -53,6 +161,14 @@ public class SysNoticeController extends BaseController {
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysNotice notice) {
         notice.setCreateBy(getUsername());
+        // 新建的公告默认为未发布状态
+        if (notice.getPublishStatus() == null || notice.getPublishStatus().isEmpty()) {
+            notice.setPublishStatus("0");
+        }
+        // 设置默认优先级为中（2）
+        if (notice.getPriority() == null || notice.getPriority().isEmpty()) {
+            notice.setPriority("2");
+        }
         return toAjax(noticeService.insertNotice(notice));
     }
 
@@ -76,4 +192,42 @@ public class SysNoticeController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] noticeIds) {
         return toAjax(noticeService.deleteNoticeByIds(noticeIds));
     }
+
+    /**
+     * 发布公告/通知
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+    @Log(title = "发布公告", businessType = BusinessType.UPDATE)
+    @PutMapping("/publish/{noticeId}")
+    public AjaxResult publish(@PathVariable Long noticeId) {
+        SysNotice notice = noticeService.selectNoticeById(noticeId);
+        if (notice == null) {
+            return error("公告不存在");
+        }
+        if ("1".equals(notice.getPublishStatus())) {
+            return error("该公告已发布");
+        }
+        notice.setPublishStatus("1");
+        notice.setUpdateBy(getUsername());
+        return toAjax(noticeService.updateNotice(notice));
+    }
+
+    /**
+     * 取消发布公告/通知
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+    @Log(title = "取消发布", businessType = BusinessType.UPDATE)
+    @PutMapping("/unpublish/{noticeId}")
+    public AjaxResult unpublish(@PathVariable Long noticeId) {
+        SysNotice notice = noticeService.selectNoticeById(noticeId);
+        if (notice == null) {
+            return error("公告不存在");
+        }
+        if ("0".equals(notice.getPublishStatus())) {
+            return error("该公告未发布");
+        }
+        notice.setPublishStatus("0");
+        notice.setUpdateBy(getUsername());
+        return toAjax(noticeService.updateNotice(notice));
+    }
 }

openhis-server-new/core-common/src/main/java/com/core/common/utils/SecurityUtils.java

@@ -76,6 +76,25 @@ public class SecurityUtils {
         }
     }
 
+    /**
+     * 安全获取用户名（失败时返回默认值）
+     **/
+    public static String getUsernameSafe() {
+        try {
+            Authentication authentication = getAuthentication();
+            if (authentication != null && authentication.getPrincipal() != null) {
+                if (authentication.getPrincipal() instanceof LoginUser) {
+                    return ((LoginUser) authentication.getPrincipal()).getUsername();
+                } else {
+                    return authentication.getPrincipal().toString();
+                }
+            }
+        } catch (Exception e) {
+            // 静默处理异常，返回默认值
+        }
+        return "anonymous";
+    }
+
     /**
      * 获取Authentication
      */

openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/FlowEl.java

@@ -1,12 +1,10 @@
 package com.core.flowable.common.expand.el;
 
-import javax.annotation.Resource;
-
+import com.core.system.service.ISysDeptService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import com.core.system.service.ISysDeptService;
-
-import lombok.extern.slf4j.Slf4j;
+import javax.annotation.Resource;
 
 /**
  * 扩展表达式

openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowDefinitionController.java

@@ -1,22 +1,5 @@
 package com.core.flowable.controller;
 
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -30,11 +13,25 @@ import com.core.system.domain.SysExpression;
 import com.core.system.service.ISysExpressionService;
 import com.core.system.service.ISysRoleService;
 import com.core.system.service.ISysUserService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>

openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowInstanceController.java

@@ -1,21 +1,19 @@
 package com.core.flowable.controller;
 
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.enums.BusinessType;
 import com.core.flowable.domain.vo.FlowTaskVo;
 import com.core.flowable.service.IFlowInstanceService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
 
 /**
  * <p>

openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowTaskController.java

@@ -1,16 +1,5 @@
 package com.core.flowable.controller;
 
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -19,11 +8,19 @@ import com.core.flowable.domain.dto.FlowTaskDto;
 import com.core.flowable.domain.vo.FlowQueryVo;
 import com.core.flowable.domain.vo.FlowTaskVo;
 import com.core.flowable.service.IFlowTaskService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 /**
  * <p>

openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysExpressionController.java

@@ -1,13 +1,5 @@
 package com.core.flowable.controller;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -16,6 +8,12 @@ import com.core.common.enums.BusinessType;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.domain.SysExpression;
 import com.core.system.service.ISysExpressionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 流程达式Controller

openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysFormController.java

@@ -1,11 +1,5 @@
 package com.core.flowable.controller;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -16,6 +10,11 @@ import com.core.flowable.service.ISysDeployFormService;
 import com.core.flowable.service.ISysFormService;
 import com.core.system.domain.SysDeployForm;
 import com.core.system.domain.SysForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 流程表单Controller

openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysListenerController.java

@@ -1,13 +1,5 @@
 package com.core.flowable.controller;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -16,6 +8,12 @@ import com.core.common.enums.BusinessType;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.domain.SysListener;
 import com.core.system.service.ISysListenerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 流程监听Controller

openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowCommentDto.java

@@ -1,10 +1,10 @@
 package com.core.flowable.domain.dto;
 
-import java.io.Serializable;
-
 import lombok.Builder;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author system
  * @date 2021/3/28 15:50

openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowFromFieldDTO.java

@@ -1,9 +1,9 @@
 package com.core.flowable.domain.dto;
 
-import java.io.Serializable;
-
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author system
  * @date 2021/3/31 23:20

openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowNextDto.java

@@ -1,9 +1,9 @@
 package com.core.flowable.domain.dto;
 
-import java.io.Serializable;
-
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 动态人员、组
  * 

openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowSaveXmlVo.java

@@ -1,9 +1,9 @@
 package com.core.flowable.domain.dto;
 
-import java.io.Serializable;
-
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author system
  * @date 2021/3/28 19:48

openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowTaskDto.java

@@ -1,15 +1,14 @@
 package com.core.flowable.domain.dto;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 工作流任务

openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowViewerDto.java

@@ -1,9 +1,9 @@
 package com.core.flowable.domain.dto;
 
-import java.io.Serializable;
-
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author system
  * @date 2021/4/21 20:55

openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowTaskVo.java

@@ -1,12 +1,12 @@
 package com.core.flowable.domain.vo;
 
-import java.util.List;
-import java.util.Map;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 流程任务

openhis-server-new/core-flowable/src/main/java/com/core/flowable/factory/FlowServiceFactory.java

@@ -1,12 +1,11 @@
 package com.core.flowable.factory;
 
-import javax.annotation.Resource;
-
+import lombok.Getter;
 import org.flowable.engine.*;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import lombok.Getter;
+import javax.annotation.Resource;
 
 /**
  * flowable 引擎注入封装

openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramCanvas.java

@@ -1,5 +1,11 @@
 package com.core.flowable.flow;
 
+import org.flowable.bpmn.model.AssociationDirection;
+import org.flowable.bpmn.model.GraphicInfo;
+import org.flowable.image.impl.DefaultProcessDiagramCanvas;
+import org.flowable.image.util.ReflectUtil;
+
+import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.font.FontRenderContext;
 import java.awt.font.LineBreakMeasurer;
@@ -13,13 +19,6 @@ import java.io.IOException;
 import java.text.AttributedCharacterIterator;
 import java.text.AttributedString;
 
-import javax.imageio.ImageIO;
-
-import org.flowable.bpmn.model.AssociationDirection;
-import org.flowable.bpmn.model.GraphicInfo;
-import org.flowable.image.impl.DefaultProcessDiagramCanvas;
-import org.flowable.image.util.ReflectUtil;
-
 /**
  * @author system
  * @date 2021/4/4 23:58

openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramGenerator.java

@@ -1,13 +1,13 @@
 package com.core.flowable.flow;
 
-import java.util.Iterator;
-import java.util.List;
-
 import org.flowable.bpmn.model.*;
 import org.flowable.bpmn.model.Process;
 import org.flowable.image.impl.DefaultProcessDiagramCanvas;
 import org.flowable.image.impl.DefaultProcessDiagramGenerator;
 
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * @author system
  * @date 2021/4/5 0:31

openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FindNextNodeUtil.java

@@ -1,17 +1,16 @@
 package com.core.flowable.flow;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
+import com.googlecode.aviator.AviatorEvaluator;
+import com.googlecode.aviator.Expression;
 import org.flowable.bpmn.model.*;
 import org.flowable.bpmn.model.Process;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.repository.ProcessDefinition;
 
-import com.googlecode.aviator.AviatorEvaluator;
-import com.googlecode.aviator.Expression;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author system

openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FlowableUtils.java

@@ -1,8 +1,6 @@
 package com.core.flowable.flow;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
+import lombok.extern.slf4j.Slf4j;
 import org.flowable.bpmn.model.*;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior;
@@ -10,7 +8,8 @@ import org.flowable.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.task.api.history.HistoricTaskInstance;
 
-import lombok.extern.slf4j.Slf4j;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author system

openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowExecutionListener.java

@@ -1,12 +1,11 @@
 package com.core.flowable.listener;
 
+import lombok.extern.slf4j.Slf4j;
 import org.flowable.common.engine.api.delegate.Expression;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.ExecutionListener;
 import org.springframework.stereotype.Component;
 
-import lombok.extern.slf4j.Slf4j;
-
 /**
  * 执行监听器
  *

openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowTaskListener.java

@@ -1,11 +1,10 @@
 package com.core.flowable.listener;
 
+import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.delegate.TaskListener;
 import org.flowable.task.service.delegate.DelegateTask;
 import org.springframework.stereotype.Component;
 
-import lombok.extern.slf4j.Slf4j;
-
 /**
  * 任务监听器
  *

openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowDefinitionService.java

@@ -1,13 +1,13 @@
 package com.core.flowable.service;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.AjaxResult;
 import com.core.system.domain.FlowProcDefDto;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
 /**
  * @author system
  * @date 2021-04-03 14:41

openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowInstanceService.java

@@ -1,11 +1,10 @@
 package com.core.flowable.service;
 
-import java.util.Map;
-
-import org.flowable.engine.history.HistoricProcessInstance;
-
 import com.core.common.core.domain.AjaxResult;
 import com.core.flowable.domain.vo.FlowTaskVo;
+import org.flowable.engine.history.HistoricProcessInstance;
+
+import java.util.Map;
 
 /**
  * @author system

openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowTaskService.java

@@ -1,11 +1,11 @@
 package com.core.flowable.service;
 
-import java.io.InputStream;
-
 import com.core.common.core.domain.AjaxResult;
 import com.core.flowable.domain.vo.FlowQueryVo;
 import com.core.flowable.domain.vo.FlowTaskVo;
 
+import java.io.InputStream;
+
 /**
  * @author system
  * @date 2021-04-03 14:42

openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysDeployFormService.java

@@ -1,10 +1,10 @@
 package com.core.flowable.service;
 
-import java.util.List;
-
 import com.core.system.domain.SysDeployForm;
 import com.core.system.domain.SysForm;
 
+import java.util.List;
+
 /**
  * 流程实例关联表单Service接口
  * 

openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysFormService.java

@@ -1,9 +1,9 @@
 package com.core.flowable.service;
 
-import java.util.List;
-
 import com.core.system.domain.SysForm;
 
+import java.util.List;
+
 /**
  * 表单
  * 

openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowDefinitionServiceImpl.java

@@ -1,25 +1,5 @@
 package com.core.flowable.service.impl;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.io.IOUtils;
-import org.flowable.bpmn.model.BpmnModel;
-import org.flowable.engine.repository.Deployment;
-import org.flowable.engine.repository.ProcessDefinition;
-import org.flowable.engine.repository.ProcessDefinitionQuery;
-import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.image.impl.DefaultProcessDiagramGenerator;
-import org.flowable.task.api.Task;
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.core.domain.entity.SysUser;
@@ -37,8 +17,25 @@ import com.core.system.service.ISysDeptService;
 import com.core.system.service.ISysUserService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.flowable.bpmn.model.BpmnModel;
+import org.flowable.engine.repository.Deployment;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.flowable.engine.repository.ProcessDefinitionQuery;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.flowable.image.impl.DefaultProcessDiagramGenerator;
+import org.flowable.task.api.Task;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * 流程定义

openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowInstanceServiceImpl.java

@@ -1,20 +1,18 @@
 package com.core.flowable.service.impl;
 
-import java.util.Map;
-import java.util.Objects;
-
-import org.flowable.common.engine.api.FlowableObjectNotFoundException;
-import org.flowable.engine.history.HistoricProcessInstance;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.utils.SecurityUtils;
 import com.core.flowable.domain.vo.FlowTaskVo;
 import com.core.flowable.factory.FlowServiceFactory;
 import com.core.flowable.service.IFlowInstanceService;
-
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.common.engine.api.FlowableObjectNotFoundException;
+import org.flowable.engine.history.HistoricProcessInstance;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * <p>

openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1,43 +1,5 @@
 package com.core.flowable.service.impl;
 
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.flowable.bpmn.model.*;
-import org.flowable.bpmn.model.Process;
-import org.flowable.common.engine.api.FlowableException;
-import org.flowable.common.engine.api.FlowableObjectNotFoundException;
-import org.flowable.engine.ProcessEngineConfiguration;
-import org.flowable.engine.history.HistoricActivityInstance;
-import org.flowable.engine.history.HistoricProcessInstance;
-import org.flowable.engine.history.HistoricProcessInstanceQuery;
-import org.flowable.engine.impl.cmd.AddMultiInstanceExecutionCmd;
-import org.flowable.engine.impl.cmd.DeleteMultiInstanceExecutionCmd;
-import org.flowable.engine.repository.ProcessDefinition;
-import org.flowable.engine.runtime.Execution;
-import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.engine.task.Comment;
-import org.flowable.identitylink.api.history.HistoricIdentityLink;
-import org.flowable.image.ProcessDiagramGenerator;
-import org.flowable.task.api.DelegationState;
-import org.flowable.task.api.Task;
-import org.flowable.task.api.TaskQuery;
-import org.flowable.task.api.history.HistoricTaskInstance;
-import org.flowable.task.api.history.HistoricTaskInstanceQuery;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
@@ -65,8 +27,43 @@ import com.core.flowable.service.ISysFormService;
 import com.core.system.domain.SysForm;
 import com.core.system.service.ISysRoleService;
 import com.core.system.service.ISysUserService;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.bpmn.model.*;
+import org.flowable.bpmn.model.Process;
+import org.flowable.common.engine.api.FlowableException;
+import org.flowable.common.engine.api.FlowableObjectNotFoundException;
+import org.flowable.engine.ProcessEngineConfiguration;
+import org.flowable.engine.history.HistoricActivityInstance;
+import org.flowable.engine.history.HistoricProcessInstance;
+import org.flowable.engine.history.HistoricProcessInstanceQuery;
+import org.flowable.engine.impl.cmd.AddMultiInstanceExecutionCmd;
+import org.flowable.engine.impl.cmd.DeleteMultiInstanceExecutionCmd;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.flowable.engine.runtime.Execution;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.flowable.engine.task.Comment;
+import org.flowable.identitylink.api.history.HistoricIdentityLink;
+import org.flowable.image.ProcessDiagramGenerator;
+import org.flowable.task.api.DelegationState;
+import org.flowable.task.api.Task;
+import org.flowable.task.api.TaskQuery;
+import org.flowable.task.api.history.HistoricTaskInstance;
+import org.flowable.task.api.history.HistoricTaskInstanceQuery;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * @author system

openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysDeployFormServiceImpl.java

@@ -1,15 +1,14 @@
 package com.core.flowable.service.impl;
 
-import java.util.List;
-import java.util.Objects;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.core.flowable.service.ISysDeployFormService;
 import com.core.system.domain.SysDeployForm;
 import com.core.system.domain.SysForm;
 import com.core.system.mapper.SysDeployFormMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
 
 /**
  * 流程实例关联表单Service业务层处理

openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysFormServiceImpl.java

@@ -1,14 +1,13 @@
 package com.core.flowable.service.impl;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.core.common.utils.DateUtils;
 import com.core.flowable.service.ISysFormService;
 import com.core.system.domain.SysForm;
 import com.core.system.mapper.SysFormMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 流程表单Service业务层处理

openhis-server-new/core-framework/pom.xml

@@ -60,6 +60,17 @@
             <artifactId>core-system</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.core</groupId>
+            <artifactId>core-common</artifactId>
+        </dependency>
+
+        <!-- JSQLParser - 用于MyBatis Plus -->
+        <dependency>
+            <groupId>com.github.jsqlparser</groupId>
+            <artifactId>jsqlparser</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataScopeAspect.java

@@ -1,13 +1,5 @@
 package com.core.framework.aspectj;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.springframework.stereotype.Component;
-
 import com.core.common.annotation.DataScope;
 import com.core.common.constant.UserConstants;
 import com.core.common.core.domain.BaseEntity;
@@ -18,6 +10,13 @@ import com.core.common.core.text.Convert;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.framework.security.context.PermissionContextHolder;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 数据过滤处理

openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataSourceAspect.java

@@ -1,7 +1,8 @@
 package com.core.framework.aspectj;
 
-import java.util.Objects;
-
+import com.core.common.annotation.DataSource;
+import com.core.common.utils.StringUtils;
+import com.core.framework.datasource.DynamicDataSourceContextHolder;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -13,9 +14,7 @@ import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
-import com.core.common.annotation.DataSource;
-import com.core.common.utils.StringUtils;
-import com.core.framework.datasource.DynamicDataSourceContextHolder;
+import java.util.Objects;
 
 /**
  * 多数据源处理

openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java

@@ -1,24 +1,5 @@
 package com.core.framework.aspectj;
 
-import java.util.Collection;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.NamedThreadLocal;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.multipart.MultipartFile;
-
 import com.alibaba.fastjson2.JSON;
 import com.core.common.annotation.Log;
 import com.core.common.core.domain.entity.SysUser;
@@ -33,6 +14,23 @@ import com.core.common.utils.ip.IpUtils;
 import com.core.framework.manager.AsyncManager;
 import com.core.framework.manager.factory.AsyncFactory;
 import com.core.system.domain.SysOperLog;
+import org.apache.commons.lang3.ArrayUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.NamedThreadLocal;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Collection;
+import java.util.Map;
 
 /**
  * 操作日志记录处理

openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/RateLimiterAspect.java

@@ -1,9 +1,10 @@
 package com.core.framework.aspectj;
 
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-
+import com.core.common.annotation.RateLimiter;
+import com.core.common.enums.LimitType;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.StringUtils;
+import com.core.common.utils.ip.IpUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
@@ -15,11 +16,9 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.script.RedisScript;
 import org.springframework.stereotype.Component;
 
-import com.core.common.annotation.RateLimiter;
-import com.core.common.enums.LimitType;
-import com.core.common.exception.ServiceException;
-import com.core.common.utils.StringUtils;
-import com.core.common.utils.ip.IpUtils;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * 限流处理

openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java

@@ -11,9 +11,10 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
 
 /**
  * 事务处理
+ * 已注释：与 @Transactional 注解冲突，导致事务回滚错误
  */
-@Aspect
-@Component
+//@Aspect
+//@Component
 public class TransactionAspect {
 
     private final PlatformTransactionManager transactionManager;
@@ -23,19 +24,19 @@ public class TransactionAspect {
         this.transactionManager = transactionManager;
     }
 
-    @Before("@annotation(org.springframework.web.bind.annotation.PostMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.GetMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.PutMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.DeleteMapping)")
+    //@Before("@annotation(org.springframework.web.bind.annotation.PostMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.GetMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.PutMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.DeleteMapping)")
     public void beginTransaction() {
         TransactionStatus status = transactionManager.getTransaction(new DefaultTransactionDefinition());
         transactionStatus.set(status);
     }
 
-    @AfterReturning("@annotation(org.springframework.web.bind.annotation.PostMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.GetMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.PutMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.DeleteMapping)")
+    //@AfterReturning("@annotation(org.springframework.web.bind.annotation.PostMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.GetMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.PutMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.DeleteMapping)")
     public void commitTransaction() {
         TransactionStatus status = transactionStatus.get();
         if (status != null && !status.isCompleted()) {
@@ -44,11 +45,11 @@ public class TransactionAspect {
         }
     }
 
-    @AfterThrowing(pointcut = "@annotation(org.springframework.web.bind.annotation.PostMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.GetMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.PutMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.DeleteMapping)",
-            throwing = "ex")
+    //@AfterThrowing(pointcut = "@annotation(org.springframework.web.bind.annotation.PostMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.GetMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.PutMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.DeleteMapping)",
+    //        throwing = "ex")
     public void rollbackTransaction(Exception ex) {
         TransactionStatus status = transactionStatus.get();
         if (status != null && !status.isCompleted()) {

openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java

@@ -1,13 +1,13 @@
 package com.core.framework.config;
 
-import java.util.TimeZone;
-
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
+import java.util.TimeZone;
+
 /**
  * 程序注解配置
  *

openhis-server-new/core-framework/src/main/java/com/core/framework/config/CaptchaConfig.java

@@ -1,14 +1,13 @@
 package com.core.framework.config;
 
-import static com.google.code.kaptcha.Constants.*;
-
-import java.util.Properties;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 import com.google.code.kaptcha.impl.DefaultKaptcha;
 import com.google.code.kaptcha.util.Config;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Properties;
+
+import static com.google.code.kaptcha.Constants.*;
 
 /**
  * 验证码配置

openhis-server-new/core-framework/src/main/java/com/core/framework/config/DruidConfig.java

@@ -1,19 +1,5 @@
 package com.core.framework.config;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.*;
-import javax.sql.DataSource;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
 import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
@@ -22,6 +8,18 @@ import com.core.common.enums.DataSourceType;
 import com.core.common.utils.spring.SpringUtils;
 import com.core.framework.config.properties.DruidProperties;
 import com.core.framework.datasource.DynamicDataSource;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import javax.servlet.*;
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * druid 配置多数据源

openhis-server-new/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java

@@ -1,15 +1,14 @@
 package com.core.framework.config;
 
-import java.nio.charset.Charset;
-
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.SerializationException;
-
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONReader;
 import com.alibaba.fastjson2.JSONWriter;
 import com.alibaba.fastjson2.filter.Filter;
 import com.core.common.constant.Constants;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.SerializationException;
+
+import java.nio.charset.Charset;
 
 /**
  * Redis使用FastJson序列化

openhis-server-new/core-framework/src/main/java/com/core/framework/config/FilterConfig.java

@@ -1,19 +1,17 @@
 package com.core.framework.config;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.DispatcherType;
-
+import com.core.common.filter.RepeatableFilter;
+import com.core.common.filter.XssFilter;
+import com.core.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.core.common.filter.RepeatableFilter;
-import com.core.common.filter.XssFilter;
-import com.core.common.utils.StringUtils;
+import javax.servlet.DispatcherType;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Filter配置

openhis-server-new/core-framework/src/main/java/com/core/framework/config/I18nConfig.java

@@ -1,5 +1,6 @@
 package com.core.framework.config;
 
+import com.core.common.constant.Constants;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.LocaleResolver;
@@ -8,8 +9,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 
-import com.core.common.constant.Constants;
-
 /**
  * 资源文件配置加载
  * 

openhis-server-new/core-framework/src/main/java/com/core/framework/config/KaptchaTextCreator.java

@@ -1,9 +1,9 @@
 package com.core.framework.config;
 
-import java.util.Random;
-
 import com.google.code.kaptcha.text.impl.DefaultTextCreator;
 
+import java.util.Random;
+
 /**
  * 验证码文本生成器
  *

openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java

@@ -1,17 +1,5 @@
 package com.core.framework.config;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
@@ -20,9 +8,18 @@ import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInt
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
 import com.core.common.utils.SecurityUtils;
-
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 @EnableTransactionManagement(proxyTargetClass = true)
 @Configuration

openhis-server-new/core-framework/src/main/java/com/core/framework/config/ResourcesConfig.java

@@ -1,7 +1,8 @@
 package com.core.framework.config;
 
-import java.util.concurrent.TimeUnit;
-
+import com.core.common.config.CoreConfig;
+import com.core.common.constant.Constants;
+import com.core.framework.interceptor.RepeatSubmitInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -13,9 +14,7 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.core.common.config.CoreConfig;
-import com.core.common.constant.Constants;
-import com.core.framework.interceptor.RepeatSubmitInterceptor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 通用配置

openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java

@@ -1,5 +1,9 @@
 package com.core.framework.config;
 
+import com.core.framework.config.properties.PermitAllUrlProperties;
+import com.core.framework.security.filter.JwtAuthenticationTokenFilter;
+import com.core.framework.security.handle.AuthenticationEntryPointImpl;
+import com.core.framework.security.handle.LogoutSuccessHandlerImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -17,11 +21,6 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
 import org.springframework.security.web.authentication.logout.LogoutFilter;
 import org.springframework.web.filter.CorsFilter;
 
-import com.core.framework.config.properties.PermitAllUrlProperties;
-import com.core.framework.security.filter.JwtAuthenticationTokenFilter;
-import com.core.framework.security.handle.AuthenticationEntryPointImpl;
-import com.core.framework.security.handle.LogoutSuccessHandlerImpl;
-
 /**
  * spring security配置
  * 

openhis-server-new/core-framework/src/main/java/com/core/framework/config/ServerConfig.java

@@ -1,10 +1,9 @@
 package com.core.framework.config;
 
-import javax.servlet.http.HttpServletRequest;
-
+import com.core.common.utils.ServletUtils;
 import org.springframework.stereotype.Component;
 
-import com.core.common.utils.ServletUtils;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 服务相关配置

openhis-server-new/core-framework/src/main/java/com/core/framework/config/ThreadPoolConfig.java

@@ -1,15 +1,14 @@
 package com.core.framework.config;
 
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadPoolExecutor;
-
+import com.core.common.utils.Threads;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
-import com.core.common.utils.Threads;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadPoolExecutor;
 
 /**
  * 线程池配置

openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/DruidProperties.java

@@ -1,10 +1,9 @@
 package com.core.framework.config.properties;
 
+import com.alibaba.druid.pool.DruidDataSource;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
-import com.alibaba.druid.pool.DruidDataSource;
-
 /**
  * druid 配置属性
  * 

openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/PermitAllUrlProperties.java

@@ -1,8 +1,6 @@
 package com.core.framework.config.properties;
 
-import java.util.*;
-import java.util.regex.Pattern;
-
+import com.core.common.annotation.Anonymous;
 import org.apache.commons.lang3.RegExUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
@@ -14,7 +12,8 @@ import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
-import com.core.common.annotation.Anonymous;
+import java.util.*;
+import java.util.regex.Pattern;
 
 /**
  * 设置Anonymous注解允许匿名访问的url

openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSource.java

@@ -1,10 +1,9 @@
 package com.core.framework.datasource;
 
-import java.util.Map;
+import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 
 import javax.sql.DataSource;
-
-import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
+import java.util.Map;
 
 /**
  * 动态数据源

openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java

@@ -1,18 +1,16 @@
 package com.core.framework.handler;
 
-import java.util.Date;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.ibatis.reflection.MetaObject;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.SecurityUtils;
 import com.core.framework.config.TenantContext;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 
 @Component
 public class MybastisColumnsHandler implements MetaObjectHandler {

openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java

@@ -1,18 +1,16 @@
 package com.core.framework.interceptor;
 
-import java.lang.reflect.Method;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.HandlerInterceptor;
-
 import com.alibaba.fastjson2.JSON;
 import com.core.common.annotation.RepeatSubmit;
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.utils.ServletUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
 
 /**
  * 防止重复提交拦截器

openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java

@@ -1,15 +1,5 @@
 package com.core.framework.interceptor.impl;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
 import com.alibaba.fastjson2.JSON;
 import com.core.common.annotation.RepeatSubmit;
 import com.core.common.constant.CacheConstants;
@@ -18,6 +8,14 @@ import com.core.common.filter.RepeatedlyRequestWrapper;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.http.HttpHelper;
 import com.core.framework.interceptor.RepeatSubmitInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 判断请求url和数据是否和上一次相同， 如果和上次相同，则是重复提交表单。 有效时间为10秒内。

openhis-server-new/core-framework/src/main/java/com/core/framework/manager/AsyncManager.java

@@ -1,12 +1,12 @@
 package com.core.framework.manager;
 
+import com.core.common.utils.Threads;
+import com.core.common.utils.spring.SpringUtils;
+
 import java.util.TimerTask;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import com.core.common.utils.Threads;
-import com.core.common.utils.spring.SpringUtils;
-
 /**
  * 异步任务管理器
  * 

openhis-server-new/core-framework/src/main/java/com/core/framework/manager/ShutdownManager.java

@@ -1,11 +1,11 @@
 package com.core.framework.manager;
 
-import javax.annotation.PreDestroy;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PreDestroy;
+
 /**
  * 确保应用退出时能关闭后台线程
  *

openhis-server-new/core-framework/src/main/java/com/core/framework/manager/factory/AsyncFactory.java

@@ -1,10 +1,5 @@
 package com.core.framework.manager.factory;
 
-import java.util.TimerTask;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.core.common.constant.Constants;
 import com.core.common.utils.LogUtils;
 import com.core.common.utils.ServletUtils;
@@ -16,8 +11,11 @@ import com.core.system.domain.SysLogininfor;
 import com.core.system.domain.SysOperLog;
 import com.core.system.service.ISysLogininforService;
 import com.core.system.service.ISysOperLogService;
-
 import eu.bitwalker.useragentutils.UserAgent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.TimerTask;
 
 /**
  * 异步工厂（产生任务用）

openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/PermissionContextHolder.java

@@ -1,10 +1,9 @@
 package com.core.framework.security.context;
 
+import com.core.common.core.text.Convert;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 
-import com.core.common.core.text.Convert;
-
 /**
  * 权限信息
  * 

openhis-server-new/core-framework/src/main/java/com/core/framework/security/filter/JwtAuthenticationTokenFilter.java

@@ -1,12 +1,9 @@
 package com.core.framework.security.filter;
 
-import java.io.IOException;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.core.common.core.domain.model.LoginUser;
+import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.StringUtils;
+import com.core.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -14,10 +11,11 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import com.core.common.core.domain.model.LoginUser;
-import com.core.common.utils.SecurityUtils;
-import com.core.common.utils.StringUtils;
-import com.core.framework.web.service.TokenService;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 /**
  * token过滤器 验证token有效性

openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java

@@ -1,20 +1,18 @@
 package com.core.framework.security.handle;
 
-import java.io.IOException;
-import java.io.Serializable;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.AuthenticationEntryPoint;
-import org.springframework.stereotype.Component;
-
 import com.alibaba.fastjson2.JSON;
 import com.core.common.constant.HttpStatus;
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.utils.ServletUtils;
 import com.core.common.utils.StringUtils;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.Serializable;
 
 /**
  * 认证失败处理类 返回未授权

openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java

@@ -1,16 +1,5 @@
 package com.core.framework.security.handle;
 
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
-
 import com.alibaba.fastjson2.JSON;
 import com.core.common.constant.Constants;
 import com.core.common.core.domain.AjaxResult;
@@ -21,6 +10,15 @@ import com.core.common.utils.StringUtils;
 import com.core.framework.manager.AsyncManager;
 import com.core.framework.manager.factory.AsyncFactory;
 import com.core.framework.web.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 /**
  * 自定义退出处理类 返回成功

openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/Server.java

@@ -1,14 +1,8 @@
 package com.core.framework.web.domain;
 
-import java.net.UnknownHostException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-
 import com.core.common.utils.Arith;
 import com.core.common.utils.ip.IpUtils;
 import com.core.framework.web.domain.server.*;
-
 import oshi.SystemInfo;
 import oshi.hardware.CentralProcessor;
 import oshi.hardware.CentralProcessor.TickType;
@@ -19,6 +13,11 @@ import oshi.software.os.OSFileStore;
 import oshi.software.os.OperatingSystem;
 import oshi.util.Util;
 
+import java.net.UnknownHostException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+
 /**
  * 服务器相关信息
  * 

openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Jvm.java

@@ -1,10 +1,10 @@
 package com.core.framework.web.domain.server;
 
-import java.lang.management.ManagementFactory;
-
 import com.core.common.utils.Arith;
 import com.core.common.utils.DateUtils;
 
+import java.lang.management.ManagementFactory;
+
 /**
  * JVM相关信息
  * 

openhis-server-new/core-framework/src/main/java/com/core/framework/web/exception/GlobalExceptionHandler.java

@@ -1,7 +1,13 @@
 package com.core.framework.web.exception;
 
-import javax.servlet.http.HttpServletRequest;
-
+import com.core.common.constant.HttpStatus;
+import com.core.common.core.domain.AjaxResult;
+import com.core.common.core.text.Convert;
+import com.core.common.exception.DemoModeException;
+import com.core.common.exception.NonCaptureException;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.StringUtils;
+import com.core.common.utils.html.EscapeUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.access.AccessDeniedException;
@@ -13,14 +19,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 
-import com.core.common.constant.HttpStatus;
-import com.core.common.core.domain.AjaxResult;
-import com.core.common.core.text.Convert;
-import com.core.common.exception.DemoModeException;
-import com.core.common.exception.NonCaptureException;
-import com.core.common.exception.ServiceException;
-import com.core.common.utils.StringUtils;
-import com.core.common.utils.html.EscapeUtil;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 全局异常处理器

openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/PermissionService.java

@@ -1,16 +1,15 @@
 package com.core.framework.web.service;
 
-import java.util.Set;
-
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
 import com.core.common.constant.Constants;
 import com.core.common.core.domain.entity.SysRole;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.framework.security.context.PermissionContextHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Set;
 
 /**
  * 首创 自定义权限实现，ss取自SpringSecurity首字母

openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java

@@ -1,19 +1,5 @@
 package com.core.framework.web.service;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import javax.annotation.Resource;
-
-import com.core.common.enums.DelFlag;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Component;
-
 import com.alibaba.fastjson2.JSONObject;
 import com.core.common.constant.CacheConstants;
 import com.core.common.constant.Constants;
@@ -24,6 +10,7 @@ import com.core.common.core.domain.entity.SysUser;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.core.domain.model.LoginUserExtend;
 import com.core.common.core.redis.RedisCache;
+import com.core.common.enums.DelFlag;
 import com.core.common.enums.TenantStatus;
 import com.core.common.exception.ServiceException;
 import com.core.common.exception.user.*;
@@ -39,6 +26,17 @@ import com.core.system.service.ISysConfigService;
 import com.core.system.service.ISysTenantOptionService;
 import com.core.system.service.ISysTenantService;
 import com.core.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * 登录校验方法

openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPasswordService.java

@@ -1,12 +1,5 @@
 package com.core.framework.web.service;
 
-import java.util.concurrent.TimeUnit;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Component;
-
 import com.core.common.constant.CacheConstants;
 import com.core.common.core.domain.entity.SysUser;
 import com.core.common.core.redis.RedisCache;
@@ -14,6 +7,12 @@ import com.core.common.exception.user.UserPasswordNotMatchException;
 import com.core.common.exception.user.UserPasswordRetryLimitExceedException;
 import com.core.common.utils.SecurityUtils;
 import com.core.framework.security.context.AuthenticationContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
 
 /**
  * 登录密码方法

openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java

@@ -1,19 +1,18 @@
 package com.core.framework.web.service;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
 import com.core.common.constant.UserConstants;
 import com.core.common.core.domain.entity.SysRole;
 import com.core.common.core.domain.entity.SysUser;
 import com.core.common.utils.StringUtils;
 import com.core.system.service.ISysMenuService;
 import com.core.system.service.ISysRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 用户权限处理

openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysRegisterService.java

@@ -1,8 +1,5 @@
 package com.core.framework.web.service;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.core.common.constant.CacheConstants;
 import com.core.common.constant.Constants;
 import com.core.common.constant.UserConstants;
@@ -18,6 +15,8 @@ import com.core.framework.manager.AsyncManager;
 import com.core.framework.manager.factory.AsyncFactory;
 import com.core.system.service.ISysConfigService;
 import com.core.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * 注册校验方法

openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/TokenService.java

@@ -1,17 +1,5 @@
 package com.core.framework.web.service;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
 import com.core.common.constant.CacheConstants;
 import com.core.common.constant.Constants;
 import com.core.common.core.domain.model.LoginUser;
@@ -21,11 +9,20 @@ import com.core.common.utils.StringUtils;
 import com.core.common.utils.ip.AddressUtils;
 import com.core.common.utils.ip.IpUtils;
 import com.core.common.utils.uuid.IdUtils;
-
 import eu.bitwalker.useragentutils.UserAgent;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * token验证处理

openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/UserDetailsServiceImpl.java

@@ -1,13 +1,5 @@
 package com.core.framework.web.service;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-
 import com.core.common.core.domain.entity.SysUser;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.enums.UserStatus;
@@ -15,6 +7,13 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.StringUtils;
 import com.core.system.service.ISysUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
 
 /**
  * 用户验证处理

openhis-server-new/core-generator/src/main/java/com/core/generator/controller/GenController.java

@@ -1,24 +1,5 @@
 package com.core.generator.controller;
 
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.poi.ss.usermodel.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
 import com.alibaba.druid.DbType;
 import com.alibaba.druid.sql.SQLUtils;
 import com.alibaba.druid.sql.ast.SQLStatement;
@@ -36,6 +17,23 @@ import com.core.generator.domain.GenTable;
 import com.core.generator.domain.GenTableColumn;
 import com.core.generator.service.IGenTableColumnService;
 import com.core.generator.service.IGenTableService;
+import org.apache.commons.io.IOUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 代码生成 操作处理

openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTable.java

@@ -1,15 +1,13 @@
 package com.core.generator.domain;
 
-import java.util.List;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-
-import org.apache.commons.lang3.ArrayUtils;
-
 import com.core.common.constant.GenConstants;
 import com.core.common.core.domain.BaseEntity;
 import com.core.common.utils.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 /**
  * 业务表 gen_table

openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTableColumn.java

@@ -1,10 +1,10 @@
 package com.core.generator.domain;
 
-import javax.validation.constraints.NotBlank;
-
 import com.core.common.core.domain.BaseEntity;
 import com.core.common.utils.StringUtils;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 代码生成业务字段表 gen_table_column
  * 

openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableColumnMapper.java

@@ -1,9 +1,9 @@
 package com.core.generator.mapper;
 
-import java.util.List;
-
 import com.core.generator.domain.GenTableColumn;
 
+import java.util.List;
+
 /**
  * 业务字段 数据层
  * 

openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableMapper.java

@@ -1,9 +1,9 @@
 package com.core.generator.mapper;
 
-import java.util.List;
-
 import com.core.generator.domain.GenTable;
 
+import java.util.List;
+
 /**
  * 业务 数据层
  * 

openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableColumnServiceImpl.java

@@ -1,13 +1,12 @@
 package com.core.generator.service;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.core.common.core.text.Convert;
 import com.core.generator.domain.GenTableColumn;
 import com.core.generator.mapper.GenTableColumnMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 业务字段 服务层实现

openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableServiceImpl.java

@@ -1,28 +1,5 @@
 package com.core.generator.service;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.core.common.constant.Constants;
@@ -37,6 +14,28 @@ import com.core.generator.mapper.GenTableMapper;
 import com.core.generator.util.GenUtils;
 import com.core.generator.util.VelocityInitializer;
 import com.core.generator.util.VelocityUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 /**
  * 业务 服务层实现

openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableColumnService.java

@@ -1,9 +1,9 @@
 package com.core.generator.service;
 
-import java.util.List;
-
 import com.core.generator.domain.GenTableColumn;
 
+import java.util.List;
+
 /**
  * 业务字段 服务层
  *