新加表重命名

bus-interceptor/src/main/resources/application.properties

@@ -1 +1 @@
-url =/userManage/loadByUsername,/redisRefresh,/loginLogHandle
+url =/userManage/loadByUsername,/redisRefresh,/loginLogHandle,/logManage/**

daqe-center/src/main/java/com/lantone/daqe/facade/BlockLossManagementFacade.java

@@ -351,8 +351,8 @@ public class BlockLossManagementFacade {
                     //文书丢失
                     List<String> redIds = medicalRecordFacade.list(new QueryWrapper<MedicalRecord>()
                             .eq("hospital_id", SysUserUtils.getCurrentHospitalId())
-                            .in("rec_id", lossResultMap.get(lossType).stream().map(BlocklossResult::getRecId))
-                            .in("behospital_code", lossResultMap.get(lossType).stream().map(BlocklossResult::getBehospitalCode))
+                            .in("rec_id", lossResultMap.get(lossType).stream().map(BlocklossResult::getRecId).collect(Collectors.toList()))
+                            .in("behospital_code", lossResultMap.get(lossType).stream().map(BlocklossResult::getBehospitalCode).collect(Collectors.toList()))
                             .eq("is_deleted", IsDeleteEnum.N.getKey()))
                             .stream().map(MedicalRecord::getRecId).collect(Collectors.toList());
                     //更新状态-已恢复
@@ -372,8 +372,8 @@ public class BlockLossManagementFacade {
                     //病案首页丢失
                     List<String> homePages = homePageFacade.list(new QueryWrapper<HomePage>()
                             .eq("hospital_id", SysUserUtils.getCurrentHospitalId())
-                            .in("home_page_id", lossResultMap.get(lossType).stream().map(BlocklossResult::getRecId))
-                            .in("behospital_code", lossResultMap.get(lossType).stream().map(BlocklossResult::getBehospitalCode))
+                            .in("home_page_id", lossResultMap.get(lossType).stream().map(BlocklossResult::getRecId).collect(Collectors.toList()))
+                            .in("behospital_code", lossResultMap.get(lossType).stream().map(BlocklossResult::getBehospitalCode).collect(Collectors.toList()))
                             .eq("is_deleted", IsDeleteEnum.N.getKey()))
                             .stream().map(HomePage::getHomePageId).collect(Collectors.toList());
 
@@ -394,7 +394,7 @@ public class BlockLossManagementFacade {
                     //患者信息丢失
                     List<String> behospitalCodes = behospitalInfoFacade.list(new QueryWrapper<BehospitalInfo>()
                             .eq("hospital_id", SysUserUtils.getCurrentHospitalId())
-                            .in("behospital_code", lossResultMap.get(lossType).stream().map(BlocklossResult::getBehospitalCode))
+                            .in("behospital_code", lossResultMap.get(lossType).stream().map(BlocklossResult::getBehospitalCode).collect(Collectors.toList()))
                             .eq("is_deleted", IsDeleteEnum.N.getKey()))
                             .stream().map(BehospitalInfo::getBehospitalCode).collect(Collectors.toList());
                     //更新状态-已恢复

daqe-center/src/main/java/com/lantone/daqe/mapper/BehospitalInfoMapperDaqe.java

@@ -8,6 +8,6 @@ import com.lantone.daqe.entity.BehospitalInfo;
  * 表名：med_behospital_info Mapper接口
  * </p>
  */
-public interface BehospitalInfoMapperDaqe extends BaseMapper<BehospitalInfo> {
+public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
 
 }

daqe-center/src/main/java/com/lantone/daqe/mapper/HomePageMapperDaqe.java

@@ -8,6 +8,6 @@ import com.lantone.daqe.entity.HomePage;
  * 表名：med_home_page Mapper接口
  * </p>
  */
-public interface HomePageMapperDaqe extends BaseMapper<HomePage> {
+public interface HomePageMapper extends BaseMapper<HomePage> {
 
 }

daqe-center/src/main/java/com/lantone/daqe/mapper/MedicalRecordContentMapperDaqe.java

@@ -8,6 +8,6 @@ import com.lantone.daqe.entity.MedicalRecordContent;
  * 表名：med_medical_record_content Mapper接口
  * </p>
  */
-public interface MedicalRecordContentMapperDaqe extends BaseMapper<MedicalRecordContent> {
+public interface MedicalRecordContentMapper extends BaseMapper<MedicalRecordContent> {
 
 }

daqe-center/src/main/java/com/lantone/daqe/mapper/MedicalRecordMapperDaqe.java

@@ -8,6 +8,6 @@ import com.lantone.daqe.entity.MedicalRecord;
  * 表名：med_medical_record Mapper接口
  * </p>
  */
-public interface MedicalRecordMapperDaqe extends BaseMapper<MedicalRecord> {
+public interface MedicalRecordMapper extends BaseMapper<MedicalRecord> {
 
 }

daqe-center/src/main/java/com/lantone/daqe/service/impl/BehospitalInfoServiceImpl.java

@@ -2,7 +2,7 @@ package com.lantone.daqe.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lantone.daqe.entity.BehospitalInfo;
-import com.lantone.daqe.mapper.BehospitalInfoMapperDaqe;
+import com.lantone.daqe.mapper.BehospitalInfoMapper;
 import com.lantone.daqe.service.BehospitalInfoService;
 import org.springframework.stereotype.Service;
 
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
  * </p>
  */
 @Service
-public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapperDaqe, BehospitalInfo> implements BehospitalInfoService {
+public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper, BehospitalInfo> implements BehospitalInfoService {
 
 }

daqe-center/src/main/java/com/lantone/daqe/service/impl/HomePageServiceImpl.java

@@ -2,7 +2,7 @@ package com.lantone.daqe.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lantone.daqe.entity.HomePage;
-import com.lantone.daqe.mapper.HomePageMapperDaqe;
+import com.lantone.daqe.mapper.HomePageMapper;
 import com.lantone.daqe.service.HomePageService;
 import org.springframework.stereotype.Service;
 
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
  * </p>
  */
 @Service
-public class HomePageServiceImpl extends ServiceImpl<HomePageMapperDaqe, HomePage> implements HomePageService {
+public class HomePageServiceImpl extends ServiceImpl<HomePageMapper, HomePage> implements HomePageService {
 
 }

daqe-center/src/main/java/com/lantone/daqe/service/impl/MedicalRecordContentServiceImpl.java

@@ -2,7 +2,7 @@ package com.lantone.daqe.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lantone.daqe.entity.MedicalRecordContent;
-import com.lantone.daqe.mapper.MedicalRecordContentMapperDaqe;
+import com.lantone.daqe.mapper.MedicalRecordContentMapper;
 import com.lantone.daqe.service.MedicalRecordContentService;
 import org.springframework.stereotype.Service;
 
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
  * </p>
  */
 @Service
-public class MedicalRecordContentServiceImpl extends ServiceImpl<MedicalRecordContentMapperDaqe, MedicalRecordContent> implements MedicalRecordContentService {
+public class MedicalRecordContentServiceImpl extends ServiceImpl<MedicalRecordContentMapper, MedicalRecordContent> implements MedicalRecordContentService {
 
 }

daqe-center/src/main/java/com/lantone/daqe/service/impl/MedicalRecordServiceImpl.java

@@ -2,7 +2,7 @@ package com.lantone.daqe.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lantone.daqe.entity.MedicalRecord;
-import com.lantone.daqe.mapper.MedicalRecordMapperDaqe;
+import com.lantone.daqe.mapper.MedicalRecordMapper;
 import com.lantone.daqe.service.MedicalRecordService;
 import org.springframework.stereotype.Service;
 
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
  * </p>
  */
 @Service
-public class MedicalRecordServiceImpl extends ServiceImpl<MedicalRecordMapperDaqe, MedicalRecord> implements MedicalRecordService {
+public class MedicalRecordServiceImpl extends ServiceImpl<MedicalRecordMapper, MedicalRecord> implements MedicalRecordService {
 
 }

daqe-center/src/main/resources/mapper/MedicalRecordMapperDaqe.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.daqe.mapper.MedicalRecordMapperDaqe">
+<mapper namespace="com.lantone.daqe.mapper.BehospitalInfoMapper">
 
 </mapper>

daqe-center/src/main/resources/mapper/HomePageMapperDaqe.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.daqe.mapper.HomePageMapperDaqe">
+<mapper namespace="com.lantone.daqe.mapper.HomePageMapper">
 
 </mapper>

daqe-center/src/main/resources/mapper/MedicalRecordContentMapperDaqe.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.daqe.mapper.MedicalRecordContentMapperDaqe">
+<mapper namespace="com.lantone.daqe.mapper.MedicalRecordContentMapper">
 
 </mapper>

daqe-center/src/main/resources/mapper/BehospitalInfoMapperDaqe.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.daqe.mapper.BehospitalInfoMapperDaqe">
+<mapper namespace="com.lantone.daqe.mapper.MedicalRecordMapper">
 
 </mapper>

daqe-center/src/main/resources/mapper/base/BaseBehospitalInfoMapperDaqe.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.daqe.mapper.BehospitalInfoMapperDaqe">
+<mapper namespace="com.lantone.daqe.mapper.BehospitalInfoMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.BehospitalInfo">

daqe-center/src/main/resources/mapper/base/BaseHomePageMapperDaqe.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.daqe.mapper.HomePageMapperDaqe">
+<mapper namespace="com.lantone.daqe.mapper.HomePageMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.HomePage">

daqe-center/src/main/resources/mapper/base/BaseMedicalRecordContentMapperDaqe.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.daqe.mapper.MedicalRecordContentMapperDaqe">
+<mapper namespace="com.lantone.daqe.mapper.MedicalRecordContentMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.MedicalRecordContent">
         <id column="rec_id" property="recId"/>
         <result column="hospital_id" property="hospitalId"/>
-        <result column="content_blob" property="contentBlob"/>
+        <result column="content_blob" property="contentBlob" typeHandler="org.apache.ibatis.type.BlobTypeHandler"/>
         <result column="content_text" property="contentText"/>
         <result column="html_text" property="htmlText"/>
         <result column="xml_text" property="xmlText"/>

daqe-center/src/main/resources/mapper/base/BaseMedicalRecordMapperDaqe.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.daqe.mapper.MedicalRecordMapperDaqe">
+<mapper namespace="com.lantone.daqe.mapper.MedicalRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.MedicalRecord">

gateway-service/src/main/resources/bootstrap.yml

@@ -121,4 +121,6 @@ secure:
       - "/report-service/medAppealInfoManage/getAppealInfo"
       - "/report-service/medAppealInfoManage/getAppealDept"
       - "/report-service/medAppealInfoManage/getAppealMode"
-      - "/daqe-center/**"
+      - "/daqe-center/**"
+      - "/security-center/logManage/getOperationLogs"
+      - "/security-center/logManage/getOperationLogNum"