Merge remote-tracking branch 'origin/dev_ch_master' into dev_nursing_records_20230214

account/account-service/src/main/resources/mapper/ChDisabAccountsDetailMapper.xml

@@ -19,8 +19,8 @@
         d.REISSUE_AMOUNT reissueAmount,
         d.ACCOUNTS_DETAIL_ID accountsDetailId,
         d.STATUS
-from  CH_DISAB_ACCOUNTS_DETAIL  d
-left join  CH_DISABLE_INFO info on d.DISAB_INFO_ID = info.DISAB_INFO_ID
+        from  CH_DISAB_ACCOUNTS_DETAIL  d
+        left join  CH_DISABLE_INFO info on d.DISAB_INFO_ID = info.DISAB_INFO_ID
         left join  CH_DISABLE_APPLY apply on info.APPLY_ID=apply.APPLY_ID
         left join CH_SRV_ORGAN  o on d.SRV_ORGAN_ID = o.SRV_ORGAN_ID
         left join ch_srv_organ_emp emp on d.emp_id = emp.emp_id

apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java

@@ -107,6 +107,16 @@ public class DisableController {
         List<ChSrvOrgan> chFndSrvModes = disableService.srvOrganList(String.valueOf(organId), srvOrganId, false);
         return Result.success(chFndSrvModes);
     }
+    /**
+     * 查询机构意向服务机构
+     *
+     * @param
+     */
+    @RequestMapping("/srvOrganList2")
+    public Result<List<ChSrvOrgan>> srvOrganList2(String organId) {
+        List<ChSrvOrgan> chFndSrvModes = disableService.srvOrganList2(String.valueOf(organId), false);
+        return Result.success(chFndSrvModes);
+    }
 
     /**
      * 查询机构下或者包含子机构下的所有护理机构

apply/apply-service/src/main/java/com/hungraim/ltc/service/DisableService.java

@@ -68,6 +68,14 @@ public interface DisableService {
     List<ChSrvOrgan> srvOrganList(String organId,Long srvOrganId, Boolean isInvolveChild);
 
     /**
+     * 查询机构意向服务机构
+     *
+     * @param organId 机构id
+     * @param isInvolveChild 是否包含子机构
+     */
+    List<ChSrvOrgan> srvOrganList2(String organId, Boolean isInvolveChild);
+
+    /**
      * 查询疾病类型
      *
      * @param parDiseTypeId 父疾病类型id

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java

@@ -346,6 +346,12 @@ public class DisableServiceImpl implements DisableService {
     }
 
     @Override
+    public List<ChSrvOrgan> srvOrganList2(String organId, Boolean isInvolveChild) {
+        List<Long> organIds = organService.getOrganIds(Long.valueOf(organId), isInvolveChild);
+        return srvOrganMapper.selectList(new LambdaQueryWrapper<ChSrvOrgan>().eq(ChSrvOrgan::getStatus, (short) 0).in(ChSrvOrgan::getOrganId, organIds));
+    }
+
+    @Override
     public List<ChFndDiseaseType> fndDiseaseList(String parDiseTypeId) {
         QueryWrapper<ChFndDiseaseType> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("IS_VALID", "0");

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java

 package com.hungraim.ltc.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.dao.AprReportMapper;
 import com.hungraim.ltc.dto.QueryDto;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.assessment.*;
@@ -15,6 +18,7 @@ import com.hungraim.ltc.service.TppesApiException;
 import com.hungraim.ltc.util.FileUtils;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
+import com.hungraim.ltc.util.TokenParsingUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -39,6 +43,8 @@ public class TaskController {
 
     @Autowired
     private TaskService taskService;
+    @Autowired
+    private AprReportMapper aprReportMapper;
 
     /**
      * 评定任务分配、查询列表
@@ -241,6 +247,39 @@ public class TaskController {
     }
 
     /**
+     * 添加评估公示信息
+     * @param taskId
+     * @return
+     */
+    @RequestMapping("/updateReportPublicityInfo")
+    public Result updateReportPublicityInfo(ChAprReport updateChAprReport,@RequestHeader("Authorization") String token) throws TppesApiException {
+
+        if(updateChAprReport.getReportId() == null){
+            return Result.failed("reportId不能为空!");
+        }
+        String reportId = String.valueOf(updateChAprReport.getReportId());
+        log.info("reportId:" +reportId);
+        ChAprReport chAprReport = aprReportMapper.selectById(reportId);
+        if(chAprReport == null){
+            return Result.failed("未查询到信息！");
+        }
+        ChAprReport newChAprReport = new ChAprReport();
+        Integer userId = TokenParsingUtil.TokenParsing(token, "userId");
+        System.out.println(chAprReport.getPublicityUser());
+        if(chAprReport.getPublicityUser() == null){
+            newChAprReport.setPublicityUser(userId);//当前登录人
+            newChAprReport.setPublicityTime(new Date());
+        }
+        newChAprReport.setPublicityStartTime(updateChAprReport.getPublicityStartTime());
+        newChAprReport.setPublicityEndTime(updateChAprReport.getPublicityEndTime());
+        newChAprReport.setPublicityLcd(new Date());//更新时间
+        newChAprReport.setPublicityLcu(userId);//更新人
+        newChAprReport.setReportId(updateChAprReport.getReportId());
+        aprReportMapper.updateById(newChAprReport);
+        return Result.success();
+    }
+
+    /**
      * 评定任务分配
      *
      * @param taskId 评定任务id,如果多条以逗号(,)分隔

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -187,6 +187,9 @@
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.acpt_srv_city = dis.DISTRICT_CODE) acptSrvCity,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.acpt_srv_area = dis.DISTRICT_CODE) acptSrvArea,
         lev.DISABLE_LEVEL_NAME riskLevel,
+        report.PUBLICITY_START_TIME publicityStartTime,
+        report.PUBLICITY_END_TIME  publicityEndTime,
+        report.PUBLICITY_TIME  publicityTime,
         report.EFF_TIME effTime
         FROM ch_apr_report report
         LEFT JOIN CH_APR_TASK task ON report.TASK_ID = task.TASK_ID

common/common-core/src/main/java/com/hungraim/ltc/constant/AuthConstants.java

@@ -39,6 +39,11 @@ public interface AuthConstants {
    */
   String PERMISSION_ROLES_RESOURCE_KEY = "ltc:roles:resource";
 
+  /**
+   * Redis缓存权限规则key
+   */
+  String PERMISSION_RESOURCE_STATUS_KEY = "ltc:interface:status";
+
 
   /**
    * 密码加密方式

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChAprReport.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 @Data
 @TableName("CH_APR_REPORT")
@@ -24,8 +27,10 @@ public class ChAprReport {
     private Integer cfgModeId;
     private java.util.Date evaluateTime;
     private String remark;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private java.util.Date publicityStartTime;
     private java.util.Date evaluationTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private java.util.Date publicityEndTime;
     private java.util.Date fcd;
     private Integer srvModeId;
@@ -44,4 +49,8 @@ public class ChAprReport {
     private String checkRemark;
     private Integer taskId;
     private Integer lcu;
+    private java.util.Date publicityTime;
+    private Integer publicityUser;
+    private Date publicityLcd;
+    private Integer publicityLcu;
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/system/SystemInterface.java

@@ -14,4 +14,8 @@ public class SystemInterface {
     private String interfaceUrl;
     private String interfaceName;
     private Date createdTime;
+    /**
+     * 是否拦截 1.拦截 0.不拦截
+     */
+    private Long interceptionStatus;
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/TaskReportVO.java

@@ -73,6 +73,16 @@ public class TaskReportVO {
     //评估类型
     private Integer evaluateType;
 
+    //公示开始时间
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date publicityStartTime;
+    //公示结束时间
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date publicityEndTime;
+    //公示时间
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date publicityTime;
+
     private Map<String,Object> chAprReportFractions;
 
     //录入时间

gateway-service/src/main/java/com/hungraim/ltc/gateway/security/AuthorizationManager.java

@@ -85,11 +85,25 @@ public class AuthorizationManager implements ReactiveAuthorizationManager<Author
                     if ("ROLE_0".equals(roleId)) {
                         return true;
                     }
+                    //如果是公共资源 直接放行
+                    if ("ROLE_1".equals(roleId)) {
+                        return true;
+                    }
+
                     String[] splitpath = path.split("/");
                     String pathNew = "/" + splitpath[1] + "/" + splitpath[2] + "/*";
                     Set<String> authorities = new HashSet<>();
+                    Map<String, String> interfaceHashMap = redisTemplate.opsForHash().entries(AuthConstants.PERMISSION_RESOURCE_STATUS_KEY);
                     Map<String, List<SystemRoleResource>> rolesResources = redisTemplate.opsForHash().entries(AuthConstants.PERMISSION_ROLES_RESOURCE_KEY);
                     Map<String, List<String>> interfaces = redisTemplate.opsForHash().entries(AuthConstants.PERMISSION_RESOURCE_INTERFACE_KEY);
+                   // Integer status = Integer.parseInt(interfaceHashMap.get(pathNew));
+                    String status= interfaceHashMap.get(pathNew);
+                    //是否拦截 1.拦截 0.不拦截
+                    if(status.equals("0")){
+                        log.info("访问路径是否拦截:不拦截");
+                        return true;
+                    }
+                    log.info("访问路径是否拦截:拦截");
                     List<SystemRoleResource> resources = rolesResources.get(roleId);
                     for (SystemRoleResource resource  : resources) {
                         List<String> systemInterfaces = interfaces.get(resource.getResourceId().toString());

system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/RoleController.java

 package com.hungraim.ltc.system.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,6 +10,7 @@ import com.hungraim.ltc.pojo.vo.system.ReqRoleInfo;
 import com.hungraim.ltc.system.dao.SystemRoleResourceMapper;
 import com.hungraim.ltc.system.service.ISystemRoleResourceService;
 import com.hungraim.ltc.system.service.ISystemRoleService;
+import com.hungraim.ltc.system.service.impl.SystemInterfaceServiceImpl;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +36,12 @@ public class RoleController {
     private SystemRoleResourceMapper systemRoleResourceMapper;
     @Autowired
     private ISystemRoleService roleService;
+    private final SystemInterfaceServiceImpl systemInterfaceService;
+
+    @Autowired
+    public RoleController(SystemInterfaceServiceImpl systemInterfaceService) {
+        this.systemInterfaceService = systemInterfaceService;
+    }
 
 
     /**
@@ -82,7 +88,7 @@ public class RoleController {
             return systemRoleResource;
         }).collect(Collectors.toList());
         roleResourceService.saveBatch(roleResources);
-
+        systemInterfaceService.listResourceInterface();
         return Result.success("新增成功");
 
     }
@@ -185,7 +191,7 @@ public class RoleController {
         if(!deleteRoleResources.isEmpty()){
             systemRoleResourceMapper.removeByIds(deleteRoleResources,reqRoleInfo.getId());
         }
-
+        systemInterfaceService.listResourceInterface();
         return Result.success("更新成功");
     }
 

system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/UserController.java

@@ -13,12 +13,10 @@ import com.hungraim.ltc.pojo.vo.system.ReqUserInfo;
 import com.hungraim.ltc.system.dao.SystemUserRoleMapper;
 import com.hungraim.ltc.system.service.ISystemUserRoleService;
 import com.hungraim.ltc.system.service.ISystemUserService;
+import com.hungraim.ltc.system.service.impl.SystemInterfaceServiceImpl;
 import com.hungraim.ltc.system.service.impl.SystemUserRoleServiceImpl;
 import com.hungraim.ltc.system.service.impl.SystemUserServiceImpl;
-import com.hungraim.ltc.util.CheckStrength;
-import com.hungraim.ltc.util.Result;
-import com.hungraim.ltc.util.ResultCode;
-import com.hungraim.ltc.util.TokenParsingUtil;
+import com.hungraim.ltc.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -39,15 +37,21 @@ import java.util.stream.Collectors;
 public class UserController {
 
 
+
+
+
     private final ISystemUserService userInfoService;
     private final ISystemUserRoleService userRoleService;
 
+    private final SystemInterfaceServiceImpl systemInterfaceService;
+
     @Resource
     private SystemUserRoleMapper systemUserRoleMapper;
     @Autowired
-    public UserController(SystemUserServiceImpl userInfoService, SystemUserRoleServiceImpl userRoleService) {
+    public UserController(SystemUserServiceImpl userInfoService, SystemUserRoleServiceImpl userRoleService, SystemInterfaceServiceImpl systemInterfaceService) {
         this.userInfoService = userInfoService;
         this.userRoleService = userRoleService;
+        this.systemInterfaceService = systemInterfaceService;
     }
 
 
@@ -127,6 +131,7 @@ public class UserController {
             return systemUserRole;
         }).collect(Collectors.toList());
         userRoleService.saveBatch(roleList);
+        systemInterfaceService.listResourceInterface();
         return Result.success("新增成功");
     }
 
@@ -282,6 +287,7 @@ public class UserController {
         if(!deleteRoleResources.isEmpty()){
             systemUserRoleMapper.removeByIds(deleteRoleResources,reqUserInfo.getId());
         }
+        systemInterfaceService.listResourceInterface();
        // systemUserRoleMapper.removeByIds(deleteRoleResources,reqUserInfo.getId());
        // userRoleService.removeByIds(deleteRoleResources);
         return Result.success("更新成功");

system/system-admin-service/src/main/java/com/hungraim/ltc/system/dao/SystemInterfaceMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Mapper
 public interface SystemInterfaceMapper extends BaseMapper<SystemInterface> {
 
-    @Select("SELECT a.INTERFACE_ID,a.INTERFACE_URL FROM LTC_INTERFACE a")
+    @Select("SELECT a.INTERFACE_ID,a.INTERFACE_URL,a.INTERCEPTION_STATUS FROM LTC_INTERFACE a")
     List<SystemInterface> listInterface();
 
     @Select("select c.RESOURCE_ID,c.INTERFACE_ID from LTC_RESOURCE_INTERFACE c")

system/system-admin-service/src/main/java/com/hungraim/ltc/system/service/impl/SystemInterfaceServiceImpl.java

@@ -40,8 +40,10 @@ public class SystemInterfaceServiceImpl extends ServiceImpl<SystemInterfaceMappe
 
             redisTemplate.delete(AuthConstants.PERMISSION_RESOURCE_INTERFACE_KEY);
             redisTemplate.delete(AuthConstants.PERMISSION_ROLES_RESOURCE_KEY);
+            redisTemplate.delete(AuthConstants.PERMISSION_RESOURCE_STATUS_KEY);
             Map<String, List<SystemRoleResource>> roleResourcesMap = new TreeMap<>();
             Map<String, List<String>> stringStringHashMap = new HashMap<>();
+            Map<String, String> interfaceHashMap = new HashMap<>();
             //角色数据
             List<Long> roles = systemInterfaceMapper.listRole();
             //角色和资源数据
@@ -50,6 +52,7 @@ public class SystemInterfaceServiceImpl extends ServiceImpl<SystemInterfaceMappe
             List<SystemResourceinterface> resourceInterface = systemInterfaceMapper.listResourceInterface();
             //接口数据
             List<SystemInterface> systemInterfaces = systemInterfaceMapper.listInterface();
+            systemInterfaces.stream().forEach(systemInterface -> interfaceHashMap.put(systemInterface.getInterfaceUrl(),systemInterface.getInterceptionStatus().toString()));
             roles.stream().forEach(role -> {
                 //角色和资源数据
                 List<SystemRoleResource> roleResourceList = roleResources.stream().filter(roleResource -> roleResource.getRoleId().equals(role)).collect(Collectors.toList());
@@ -68,6 +71,7 @@ public class SystemInterfaceServiceImpl extends ServiceImpl<SystemInterfaceMappe
                 //角色和资源
                 roleResourcesMap.put(AuthConstants.AUTHORITY_PREFIX + role.toString(),roleResourceList);
                 });
+            redisTemplate.opsForHash().putAll(AuthConstants.PERMISSION_RESOURCE_STATUS_KEY, interfaceHashMap);
             redisTemplate.opsForHash().putAll(AuthConstants.PERMISSION_ROLES_RESOURCE_KEY, roleResourcesMap);
             redisTemplate.opsForHash().putAll(AuthConstants.PERMISSION_RESOURCE_INTERFACE_KEY, stringStringHashMap);