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

apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml

@@ -121,6 +121,7 @@
                a.REASONS_REVIEW             reasonsReview,
                a.REASONS_REMARK             reasonsRemark,
                a.MEDICAL_AREA               medicalArea,
+               a.REVIEW_FREQUENCY     reviewFrequency,
                a.BANK_CARD_NO bankCardNo
         from CH_DISABLE_APPLY a
                  LEFT JOIN CH_SRV_ORGAN o ON a.SRV_ORGAN_ID = o.SRV_ORGAN_ID

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

@@ -82,11 +82,14 @@ public class TaskController {
      * @param tel       失能人员手机号码
      */
     @RequestMapping("/taskReportList")
-    public Result<List<TaskReportVO>> taskReportList(String name, String certiCode, String tel) {
-        List<TaskReportVO> taskReportList = taskService.taskReportList(name, certiCode, tel);
-        return Result.success(taskReportList);
+    public Result<Page<TaskReportVO>> taskReportList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,String name, String certiCode, String tel) {
+        Page<TaskReportVO> page = new Page<>(pageNum, pageSize);
+        page = taskService.taskReportList(page,name, certiCode, tel);
+        log.info("评定报告录入："+JSONObject.toJSONString(page));
+        return Result.success(page);
     }
 
+
     /**
      * 查询评定报告附件列表
      *
@@ -141,15 +144,15 @@ public class TaskController {
     /**
      * 评定报告新增
      * @param reportDetailVo
-     //* @param taskId         评定任务id
-     //* @param person1        鉴定人员1id
-     //* @param person2        鉴定人员2id
-     //* @param person3        鉴定人员3id
-     //* @param evaluateTime   评估时间 格式:2020-11-12
-     //* @param disableLevelId 失能等级id
-     //* @param polNo          保单号
-     //* @param remark         备注
-     //* @param fileDataList   附件
+    //* @param taskId         评定任务id
+    //* @param person1        鉴定人员1id
+    //* @param person2        鉴定人员2id
+    //* @param person3        鉴定人员3id
+    //* @param evaluateTime   评估时间 格式:2020-11-12
+    //* @param disableLevelId 失能等级id
+    //* @param polNo          保单号
+    //* @param remark         备注
+    //* @param fileDataList   附件
      */
     @RequestMapping("/addReport")
     public Result addReport(ReportDetailVO reportDetailVo) {
@@ -511,7 +514,7 @@ public class TaskController {
         String json="";
         String optType="1";//操作类型	0-鉴定机构管理人员操作，1-鉴定人员操作；
         //List<Map<String,Object>> aprList= (List<Map<String, Object>>) request.getSession().getAttribute("aprList");//鉴定机构
-       // String aprEmpId=String.valueOf(aprList.get(0).get("empId"));//操作人id
+        // String aprEmpId=String.valueOf(aprList.get(0).get("empId"));//操作人id
         //String aprOrganId=String.valueOf(aprList.get(0).get("organId"));       //操作机构id
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String optTime=sdf.format(new Date());//操作时间YYYY-MM-DD HH24:MM:SS
@@ -520,7 +523,7 @@ public class TaskController {
 
         Result<Object> objectResult= taskService.taskRefuseCause( queryDto.getTaskId(), optType, queryDto.getOrganId(), queryDto.getEmpId(), optTime, queryDto.getRefuseReason(), queryDto.getRefuseRemark(), queryDto.getStatus(), queryDto.getTaskGroupNo(), queryDto.getTaskPushId());
 
-    if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
+        if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
             //失败
             return Result.failed(objectResult.getMsg());
         }
@@ -755,7 +758,7 @@ public class TaskController {
      */
     @GetMapping("/queryAssessAccountsDetail")
     public Result<List<ChAssessDetailAccountsResp>> queryAssessAccountsDetail(String assessAccountsId) {
-            List<ChAssessDetailAccountsResp> chAssessDetailAccounts = taskService.queryAssessAccountsDetail(assessAccountsId);
+        List<ChAssessDetailAccountsResp> chAssessDetailAccounts = taskService.queryAssessAccountsDetail(assessAccountsId);
         return Result.success(chAssessDetailAccounts);
     }
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskMapper.java

@@ -42,7 +42,7 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
     /**
      * 评定报告录入列表
      */
-    List<TaskReportVO> taskReportList(String name, String certiCode, String tel);
+    Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel);
 
     TaskReportVO getReportById(String reportId);
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java

@@ -27,7 +27,7 @@ public interface TaskService {
                                                   String street, String realName, String certiCode, String taskName, String taskTel,
                                                   String daysRemaining, String taskStatus, String isReturn, String area);
 
-    List<TaskReportVO> taskReportList(String name, String certiCode, String tel);
+    Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel);
 
     List<AprEmpVO> aprEmpList(String provincial, String city, String area, String organName, String name, String tel, String groupLeader);
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -105,8 +105,8 @@ public class TaskServiceImpl implements TaskService {
      * @param tel       失能人员手机号码
      */
     @Override
-    public List<TaskReportVO> taskReportList(String name, String certiCode, String tel) {
-        return taskMapper.taskReportList(name, certiCode, tel);
+    public Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel) {
+        return taskMapper.taskReportList(page,name, certiCode, tel);
     }
 
     /**

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableExamineInfoVO.java

@@ -75,6 +75,10 @@ public class DisableExamineInfoVO {
     private Short addressType;
 
     //***失能人员医疗及失能信息
+    /**
+     * 是否首次申请 初次申请，争议复评，定期复评，变更评定
+     */
+    private Long reviewFrequency;
     //诊断疾病
     private String disease;
     private Integer diseTypeF;

gateway-service/src/main/java/com/hungraim/ltc/gateway/config/ResourceServerConfig.java

@@ -52,7 +52,7 @@ public class ResourceServerConfig {
             .jwtAuthenticationConverter(jwtAuthenticationConverter());
         http.authorizeExchange()
             .pathMatchers("/api/oauth/token","/api.system/role/getRoleResource",
-                    "/api.system/resource/getManinMenu","/oauth/*","/api/oauth/genKeyPair").permitAll()
+                    "/api.system/resource/getManinMenu","/oauth/*","/api/oauth/genKeyPair","/api.system/user/updatePassword").permitAll()
             .anyExchange().access(authorizationManager)
             .and()
             .exceptionHandling()

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

@@ -18,6 +18,7 @@ import com.hungraim.ltc.system.service.impl.SystemUserRoleServiceImpl;
 import com.hungraim.ltc.system.service.impl.SystemUserServiceImpl;
 import com.hungraim.ltc.util.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
@@ -301,6 +302,43 @@ public class UserController {
         return Result.success("更新成功");
     }
 
+    @PostMapping("/updatePassword")
+    public Result updatePassword(String oldPassword,String newPassword,@RequestHeader("Authorization") String token){
+        log.info("oldPassword:"+oldPassword+",newPassword:"+newPassword);
+        if(StringUtils.isBlank(newPassword) || StringUtils.isBlank(oldPassword)){
+            Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+
+        //校验旧密码是否匹配
+        Integer userId = TokenParsingUtil.TokenParsing(token, "userId");
+        if(userId == null){
+            return Result.failed("未获取到用户信息！");
+        }
+        SystemUser userinfo = userInfoService.getById(userId);
+        if(userinfo == null){
+            return Result.failed("未获取到用户信息！");
+        }
+        BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
+
+        String userinfoPassword = userinfo.getPassword();
+
+        if(!bCryptPasswordEncoder.matches(oldPassword, userinfoPassword)){
+            return Result.failed("旧密码不匹配！");
+        }
+
+
+        if (CheckStrength.checkPasswordStrength(newPassword) < 4) {
+            return Result.failed("密码太简单，请设置复杂密码！");
+        }
+
+
+        SystemUser user = new SystemUser();
+        user.setPassword(new BCryptPasswordEncoder().encode(newPassword));
+        user.setUserId(userId.longValue());
+        userInfoService.updateById(user);
+
+        return Result.success();
+    }
 
 
 }