init: init project step4: biz code support

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -252,6 +252,7 @@ public class ApiController {
     private final WmPkgQuizRelationService quizRelationService;
     private final WmDaHospitalService wmDaHospitalService;
     private final WmQuizService quizService;
+    private final WmUserSignService wmUserSignService;
     private final WmPlatformQuizTestResultService platformQuizTestResultService;
     private final ApplicationEventPublisher applicationEventPublisher;
 
@@ -264,92 +265,10 @@ public class ApiController {
     @SysLog("通过任务类型获取表单配置")
     @GetMapping("/getTaskContentConfigByTaskTypeId/{taskTypeId}")
     public R<?> getById(@PathVariable String taskTypeId) {
+        log.info("get_task_content_config_by_task_type_id:{}", taskTypeId);
         if (null == taskTypeId) {
             return R.failed("taskTypeId不能为空");
         }
-
-        //Map<String, Object> configMap;
-
-        // 库存调查需要调查常规的/首次的/库存盘点-中药颗粒剂的
-        log.info("get_task_content_config_by_task_type_id:{}", taskTypeId);
-        //switch (taskTypeId) {
-        //    case "14":
-        //case "31":
-        //case "37":
-        // 常规调查
-        //configMap.put("14", getTaskContentConfigByTaskTypeId("14"));
-        //// 首次调查
-        //configMap.put("31", getTaskContentConfigByTaskTypeId("31"));
-        //// 库存盘点-中药颗粒剂
-        //configMap.put("37", getTaskContentConfigByTaskTypeId("37"));
-        //break;
-        //case "39":
-        //case "40":
-        //case "41":
-        //    // 应收账款回款-A类、应收账款回款-B类、应收账款回款-C类 都取39
-        //    configMap = getTaskContentConfigByTaskTypeId("39");
-        //    break;
-        //case "42":
-        //case "43":
-        //case "44":
-        //    // 手术跟台-一级/手术跟台-二级/手术跟台-三级 都取42
-        //    configMap = getTaskContentConfigByTaskTypeId("42");
-        //    break;
-        //case "47":
-        //case "48":
-        //case "49":
-        //case "50":
-        //    // 库存调研、竞品调研、培训、使用情况调查 都取47
-        //    configMap = getTaskContentConfigByTaskTypeId("47");
-        //    break;
-        //case "51":
-        //case "52":
-        //case "53":
-        //    // 信用管理A/B/C 都取51
-        //    configMap = getTaskContentConfigByTaskTypeId("51");
-        //    break;
-        //case "56":
-        //case "57":
-        //    // 56首营管理-诊所
-        //    configMap.put("56", getTaskContentConfigByTaskTypeId("56"));
-        //    // 57首营管理-药店
-        //    configMap.put("57", getTaskContentConfigByTaskTypeId("57"));
-        //    break;
-        //case "1":
-        //case "2":
-        //case "3":
-        //case "4":
-        //case "64":
-        //    // 1,医院科室推广会 2,区域学术沙龙 3,城市卫星会 4,省级学科年会 64,线上科室会
-        //    configMap.put("1", getTaskContentConfigByTaskTypeId("1"));
-        //    configMap.put("2", getTaskContentConfigByTaskTypeId("2"));
-        //    configMap.put("3", getTaskContentConfigByTaskTypeId("3"));
-        //    configMap.put("4", getTaskContentConfigByTaskTypeId("4"));
-        //    configMap.put("64", getTaskContentConfigByTaskTypeId("64"));
-        //    break;
-        //case "801":
-        //    configMap.put("801", getTaskContentConfigByTaskTypeId("801"));
-        //
-        //    HnqzUser user = SecurityUtils.getUser();
-        //
-        //
-        //    String yycUsername = user != null ? user.getUsername() : "";
-        //
-        //    List<Map<String, String>> urls = Stream.of(RANDOM_QUIZ_URL).map(url -> {
-        //        String[] split = url.split("\\|");
-        //        Map<String, String> quizInfoMap = new HashMap<>(2);
-        //        quizInfoMap.put("label", split[0]);
-        //        quizInfoMap.put("url", split[1] + "?yycUsername=" + yycUsername + "&yycPkgId=");
-        //        return quizInfoMap;
-        //    }).collect(Collectors.toList());
-        //
-        //
-        //    configMap.put("urls", urls);
-        //    break;
-        //    default:
-        //        configMap = getTaskContentConfigByTaskTypeId(taskTypeId);
-        //        break;
-        //}
         Map<String, Object> configMap = getTaskContentConfigByTaskTypeId(taskTypeId);
         return R.ok(configMap);
     }
@@ -697,7 +616,7 @@ public class ApiController {
 
     @SysLog("通过任务类型获取表单配置")
     @GetMapping("/getTaskContentConfigByTaskTypeByShareId/{taskTypeId}")
-    public R getShareById(@PathVariable String taskTypeId) {
+    public R<?> getShareById(@PathVariable String taskTypeId) {
         if (null == taskTypeId) {
             return R.failed("taskTypeId不能为空");
 
@@ -866,7 +785,7 @@ public class ApiController {
     }
 
     @GetMapping("/getDeptBuildName/{deptId}")
-    public R getDeptBuildName(@PathVariable String deptId) {
+    public R<?> getDeptBuildName(@PathVariable String deptId) {
         Map<String, Object> connfigMap = new LinkedHashMap<>();
         if (null == deptId || "".equals(deptId)) {
             return R.failed("deptId不能为空");
@@ -1090,57 +1009,10 @@ public class ApiController {
             mapOne.put("onTheWay", String.valueOf(onTheWay));
             mapOne.put("jumpFlag", "北京遥领医疗科技有限公司".equals(sysDept.getName()) ? "1" : "0");
 
-            //// 结算渠道
-            //List<SysDeptSub> subList = sysDeptSubService.list(Wrappers.<SysDeptSub>lambdaQuery()
-            //		.eq(SysDeptSub::getDeptId, sysU.getDeptId())
-            //		.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode())
-            //);
-            //List<String> subTypeList = subList.stream()
-            //		.map(SysDeptSub::getSubjectType)
-            //		.distinct()
-            //		.collect(Collectors.toList());
-            //mapOne.put("subList", subTypeList);
-
-            //// 税源地
-            //List<SubjectLocation> subjectLocationList = subList.stream()
-            //		.map(SysDeptSub::getSubjectLocation)
-            //		.sorted(Comparator.comparing(SubjectLocation::getSort))
-            //		.collect(Collectors.toList());
-            //mapOne.put("subjectLocationList", subjectLocationList);
-
             // 查询配置了任务类型模板的任务类型
             mapOne.put("hasTaskTypeTemplate", wmDeptTaskTypeTemplateService.listTaskTypeByDeptId(sysU.getDeptId()));
 
-            //// 税源地和channel对应关系
-            //Map<String, Integer> collect = subList.stream()
-            //		.collect(Collectors.toMap(sysDeptSub -> sysDeptSub.getSubjectLocation().name(), SysDeptSub::getSubjectChannel));
-            //mapOne.put("subjectTypeAndChannel", collect);
-            //
-            //// 税源地和eidEnable对应关系
-            //Map<SubjectLocation, Boolean> subEidMap = subList.stream().collect(Collectors.toMap(SysDeptSub::getSubjectLocation, SysDeptSub::getEidEnable));
-            //mapOne.put("subjectLocationEid", subEidMap);
-
-            // todo
-            // 认证服务信息回显
-            //List<SysUserSubVO> userSignCertList = sysUserSignCertService.listUserSignCertForApi(sysU.getUserId(), sysU.getDeptId());
-            //mapOne.put("certList", userSignCertList);
-
-            // 查询E证通数据
-            Set<Integer> allUserIds = sysUserList.stream().map(UserVO::getUserId).collect(Collectors.toSet());
-            //SysUserExtRecord userExtRecord = sysUserExtRecordService.getOne(Wrappers.<SysUserExtRecord>lambdaQuery()
-            //		.in(SysUserExtRecord::getUserId, allUserIds)
-            //		.eq(SysUserExtRecord::getDelFlag, DelEnum.NOT_DEL.getVal())
-            //		.last("limit 1"));
-            //if (userExtRecord != null) {
-            //	mapOne.put("existEidResult", true);
-            //	// E证通照片
-            //	Map<String, Object> eidResultMap = new HashMap<>();
-            //	eidResultMap.put("idCardFrontUrl", userExtRecord.getIdCardFrontUrl());
-            //	eidResultMap.put("idCardBackUrl", userExtRecord.getIdCardBackUrl());
-            //	mapOne.put("eidResult", eidResultMap);
-            //} else {
             mapOne.put("existEidResult", false);
-            //}
 
             // 签署协议信息
             Set<String> agreementSet = sysUserList.stream()
@@ -1149,17 +1021,6 @@ public class ApiController {
                     .map(o -> JSONUtil.parseObj(o).getStr("agreementType"))
                     .collect(Collectors.toSet());
             mapOne.put("signedAgreement", agreementSet);
-//			int honestAgreementCount = sysUserService.count(Wrappers.<SysUser>lambdaQuery()
-//					.eq(SysUser::getUsername, sysU.getUsername())
-//					.eq(SysUser::getDelFlag, DelEnum.NOT_DEL.getVal())
-//					.like(SysUser::getSignAgreement, SignAgreementDTO.SignAgreementType.HONEST_AGREEMENT.getType()));
-//			mapOne.put("signHonestAgreement", honestAgreementCount > 0);
-//			// 签署协议信息V2
-//			int honestAgreementV2Count = sysUserService.count(Wrappers.<SysUser>lambdaQuery()
-//					.eq(SysUser::getUsername, sysU.getUsername())
-//					.eq(SysUser::getDelFlag, DelEnum.NOT_DEL.getVal())
-//					.like(SysUser::getSignAgreement, SignAgreementDTO.SignAgreementType.HONEST_AGREEMENT_V2.getType()));
-//			mapOne.put("signHonestAgreementV2", honestAgreementV2Count > 0);
 
             // 超60周岁是否提醒
             Map<String, String> checkResult = sysUserService.checkSixtyYearsOld(sysU);
@@ -1212,12 +1073,14 @@ public class ApiController {
     }
 
     /**
-     * @param input
-     * @return
+     * 获取积分规则
+     *
+     * @param input 输入
+     * @return 积分规则列表
      */
     @SysLog("获取积分规则")
     @GetMapping("/getPackageCanTaskList")
-    public R getPackageCanTaskList(WmScorePackageApiInput input) {
+    public R<?> getPackageCanTaskList(WmScorePackageApiInput input) {
         if (null == input.getPackageId()) {
             return R.failed("积分包ID不能为空");
         }
@@ -1229,9 +1092,7 @@ public class ApiController {
         WmScoreTaskType query = new WmScoreTaskType();
         query.setScoreId(input.getPackageId());
 
-        /**
-         * 所有能做的任务
-         */
+        // 所有能做的任务
         List<WmScoreTaskType> wmScoreTaskTypeList = wmScoreTaskTypeService.list(Wrappers.query(query));
         // 对应的taskTypeId
         List<String> baseIds = wmScoreTaskTypeList.stream().
@@ -1392,7 +1253,7 @@ public class ApiController {
         sysUser.setPlatId(SecurityUtils.getUser().getPlatId());
         sysUser.setDelFlag("0");
         List<SysUser> sysUserList = sysUserService.list(Wrappers.query(sysUser));
-        if (sysUserList.size() > 0) {
+        if (CollUtil.isNotEmpty(sysUserList)) {
             SysDept sysDept = sysDeptService.getById(sysUserList.get(0).getDeptId());
             wmTaskType.setLevel1Id(sysDept.getLevel2Id());
         } else {
@@ -1461,7 +1322,7 @@ public class ApiController {
         } catch (Exception e) {
             log.info("ip2Region error", e);
         }
-        ;
+
         log.info("提交任务远端地址: [{}]", region);
         log.info("saveTaskContent入参：{}", wmTaskContent);
         Set<String> errorHash = new HashSet<>();
@@ -1626,7 +1487,7 @@ public class ApiController {
      */
     @SysLog("保存任务内容")
     @PostMapping("/task-content/draft")
-    public R taskContentDraft(@RequestBody WmTaskContent wmTaskContent) {
+    public R<?> taskContentDraft(@RequestBody WmTaskContent wmTaskContent) {
 
         // 生成草稿key
         String draftKey = IdUtil.fastSimpleUUID();
@@ -1649,7 +1510,7 @@ public class ApiController {
      */
     @SysLog("获取任务草稿")
     @GetMapping("/task-content/draft/{task_type_id}")
-    public R taskContentDraft(@PathVariable(value = "task_type_id") Integer taskTypeId) {
+    public R<?> taskContentDraft(@PathVariable(value = "task_type_id") Integer taskTypeId) {
 
         HnqzUser user = SecurityUtils.getUser();
 
@@ -1669,7 +1530,7 @@ public class ApiController {
      */
     @SysLog("修改任务内容表")
     @PostMapping("/updateTaskContent")
-    public R updateById(@RequestBody WmTaskContent wmTaskContent) {
+    public R<?> updateById(@RequestBody WmTaskContent wmTaskContent) {
         return R.ok(wmTaskContentService.updateById(wmTaskContent));
     }
 
@@ -1678,10 +1539,10 @@ public class ApiController {
      *
      * @param page        分页对象
      * @param wmWkArticle 文库-文章
-     * @return
+     * @return 分页结果
      */
     @GetMapping("/getArticlePage")
-    public R getWmWkArticlePage(Page page, WmWkArticle wmWkArticle) {
+    public R<?> getWmWkArticlePage(Page<WmWkArticle> page, WmWkArticle wmWkArticle) {
         WmWkArticle query = new WmWkArticle();
         query.setEnableFlag(0);
         query.setDelFlag(0);
@@ -1698,32 +1559,6 @@ public class ApiController {
         wrapper.orderByDesc(WmWkArticle::getCreateTime);
         IPage<WmWkArticle> pages = wmWkArticleService.page(page, wrapper);
 
-//		if (showHot) {
-//			if (page.getCurrent() == 1L) {
-//				for (int i = 0; i < pages.getRecords().size(); i++) {
-//					WmWkArticle wkArticle = pages.getRecords().get(i);
-//					wkArticle.setHotFlag(1);
-////					redisTemplate.opsForZSet().add(CacheConstants.ARTICLE_HOT_KEY, wkArticle.getId(),
-////							wmWkArticle.getForwardNum());
-//					if (i >= 4) {
-//						break;
-//					}
-//				}
-//			}
-//		} else {
-//			if (page.getCurrent() == 1L) {
-//				Set<ZSetOperations.TypedTuple<String>> hotIds = redisTemplate.opsForZSet()
-//						.reverseRangeWithScores(CacheConstants.ARTICLE_HOT_KEY, 0, 4);
-//				List<Integer> ids = new ArrayList<>();
-//				hotIds.forEach(item -> ids.add(Integer.parseInt(item.getValue())));
-//				for (WmWkArticle item : pages.getRecords()) {
-//					if(ids.contains(item.getId())){
-//						item.setHotFlag(1);
-//					}
-//				}
-//			}
-//
-//		}
         return R.ok(pages);
     }
 
@@ -1735,7 +1570,7 @@ public class ApiController {
      * @return R
      */
     @GetMapping("/getArticleById")
-    public R getArticleById(Integer id) {
+    public R<?> getArticleById(Integer id) {
         WmWkArticle wmWkArticle = wmWkArticleService.getById(id);
         wmWkArticle.setReadNum(wmWkArticle.getReadNum() + 1);
         return R.ok(wmWkArticle);
@@ -1764,10 +1599,10 @@ public class ApiController {
      *
      * @param page      分页对象
      * @param wmWkAlbum 文库-相册
-     * @return
+     * @return 分页结果
      */
     @GetMapping("/getAlbumPage")
-    public R getWmWkAlbumPage(Page page, WmWkAlbum wmWkAlbum, String shareUserId) {
+    public R<?> getWmWkAlbumPage(Page<WmWkAlbum> page, WmWkAlbum wmWkAlbum, String shareUserId) {
 
         //查询当前登录人药企的
         System.out.println(shareUserId);
@@ -1787,9 +1622,7 @@ public class ApiController {
                 drugIds.addAll(entList.stream().map(ent -> ent.getId().toString()).collect(Collectors.toList()));
             }
 
-            /**
-             * 能查到药企
-             */
+            // 能查到药企
             if (CollectionUtils.isNotEmpty(drugIds)) {
                 input.setDrugIds(drugIds);
                 Page pageAnswer2 = wmWkAlbumService.pageByCondition(page, input);
@@ -1799,7 +1632,7 @@ public class ApiController {
 
         wmWkAlbum.setDelFlag(0);
         wmWkAlbum.setEnableFlag(0);
-        Page pageAnswer = wmWkAlbumService.page(page, Wrappers.query(wmWkAlbum)
+        Page<WmWkAlbum> pageAnswer = wmWkAlbumService.page(page, Wrappers.query(wmWkAlbum)
                 .lambda()
                 .orderByDesc(WmWkAlbum::getCreateTime));
         return R.ok(pageAnswer);
@@ -1810,11 +1643,11 @@ public class ApiController {
      *
      * @param page      分页对象
      * @param wmWkAlbum 文库-相册
-     * @return
+     * @return 分页结果
      */
     @Inner(false)
     @GetMapping("/getAlbumPageNew")
-    public R getAlbumPageNew(Page page, WmWkAlbum wmWkAlbum, String shareUserId) {
+    public R<?> getAlbumPageNew(Page page, WmWkAlbum wmWkAlbum, String shareUserId) {
 
         //查询当前登录人药企的
         System.out.println(shareUserId);
@@ -1843,7 +1676,7 @@ public class ApiController {
      * @return R
      */
     @GetMapping("/getAlbumById")
-    public R getById(Integer id) {
+    public R<?> getById(Integer id) {
         WmWkAlbum wmWkAlbum = wmWkAlbumService.getById(id);
         if (null != wmWkAlbum) {
             if (null != wmWkAlbum.getGlyp()) {
@@ -1900,18 +1733,17 @@ public class ApiController {
      * @return 角色列表
      */
     @GetMapping("/getDrugEntList")
-    public R listDrugEnt(WmDaDrugEnt wmDaDrugEnt) {
+    public R<?> listDrugEnt(WmDaDrugEnt wmDaDrugEnt) {
         System.out.println("SecurityUtils.getUser():" + SecurityUtils.getUser());
         System.out.println("SecurityUtils.getUser().getPlatId():" + SecurityUtils.getUser().getPlatId());
 
-        List<WmDaDrugEnt> wmDaDrugEntList = new ArrayList<>();
         if (null == SecurityUtils.getUser()) {
             wmDaDrugEnt.setDelFlag("0");
             wmDaDrugEnt.setDelFlag("0");
             return R.ok(wmDaDrugEntService.list(Wrappers.query(wmDaDrugEnt)));
         } else {
             List<SysUser> list = sysUserService.getUserByPlatId(SecurityUtils.getUser().getPlatId());
-            if (list.size() > 0) {
+            if (CollUtil.isNotEmpty(list)) {
                 List<String> deptIdList = new ArrayList<>();
                 deptIdList.add("-1");
                 for (SysUser sysU : list) {
@@ -1931,7 +1763,7 @@ public class ApiController {
 
     public List<WmDaDrugEnt> getDrugListBySecUser(String platId) {
         List<SysUser> list = sysUserService.getUserByPlatId(platId);
-        if (list.size() > 0) {
+        if (CollUtil.isNotEmpty(list)) {
             List<String> deptIdList = new ArrayList<>();
             for (SysUser sysU : list) {
                 deptIdList.add(sysU.getDeptId() + "");
@@ -1939,7 +1771,7 @@ public class ApiController {
 
             List<String> agentIdList = new ArrayList<>();
             List<SysDept> deptList = sysDeptService.listByIds(deptIdList);
-            if (deptList.size() > 0) {
+            if (CollUtil.isNotEmpty(deptList)) {
                 for (SysDept sysD : deptList) {
                     System.out.println("SysDept:" + sysD.getLevel());
 
@@ -1953,10 +1785,10 @@ public class ApiController {
                 }
             }
 
-            if (agentIdList.size() > 0) {
+            if (CollUtil.isNotEmpty(agentIdList)) {
                 List<String> drugIdList = new ArrayList<>();
                 List<WmDaAgent> wmDaAgentList = wmDaAgentService.listByIds(agentIdList);
-                if (wmDaAgentList.size() > 0) {
+                if (CollUtil.isNotEmpty(wmDaAgentList)) {
                     for (WmDaAgent wmDaAgent : wmDaAgentList) {
                         if (null != wmDaAgent.getExtDrugEnt()) {
                             drugIdList.addAll(Arrays.asList(wmDaAgent.getExtDrugEnt().split(",")));
@@ -1973,8 +1805,6 @@ public class ApiController {
         return null;
     }
 
-    private final WmUserSignService wmUserSignService;
-
 
     /**
      * 通过id查询用户签到表
@@ -1983,7 +1813,7 @@ public class ApiController {
      * @return R
      */
     @GetMapping("/getSignInfoById")
-    public R getSignInfoById(Integer id) {
+    public R<?> getSignInfoById(Integer id) {
         return R.ok(wmUserSignService.getById(id));
     }
 
@@ -2025,7 +1855,7 @@ public class ApiController {
      * @return 角色列表
      */
     @GetMapping("/getSignListByUserId")
-    public R listDrugEnt(WmUserSign wmUserSign) {
+    public R<?> listDrugEnt(WmUserSign wmUserSign) {
         return R.ok(wmUserSignService.list(Wrappers.query(wmUserSign)));
     }
 
@@ -2036,7 +1866,7 @@ public class ApiController {
      * @return 角色列表
      */
     @GetMapping("/getHospitalList")
-    public R getHospitalList(String longitude, String latitude, String type) {
+    public R<?> getHospitalList() {
         return R.ok(wmDaHospitalService.list(Wrappers.emptyWrapper()));
     }
 
@@ -2282,7 +2112,7 @@ public class ApiController {
      * @return R
      */
     @GetMapping("/getScorePackageInfoById")
-    public R getScorePackageInfoById(String id) {
+    public R<?> getScorePackageInfoById(String id) {
         WmScorePackage wms = wmScorePackageService.getById(id);
         Map<String, Object> map = new HashMap<>();
         SysDept dept = sysDeptService.getById(wms.getSendPackageDeptId());
@@ -2382,7 +2212,7 @@ public class ApiController {
      */
     @Deprecated
     @GetMapping("/receivePackage")
-    public R receivePackage(String packageId) {
+    public R<?> receivePackage(String packageId) {
         WmScorePackage wmScorePackage = wmScorePackageService.getById(packageId);
         if (null == wmScorePackage) {
             return R.failed("积分包不存在");
@@ -2583,7 +2413,7 @@ public class ApiController {
      * @return 根据积分包获取任务列表
      */
     @GetMapping("/getTaskListByPackageId")
-    public R getTaskListByPackageId(Page page, WmTask wmTask) {
+    public R<?> getTaskListByPackageId(Page page, WmTask wmTask) {
 
         Page<WmTask> taskPage = wmTaskService.page(page,
                 Wrappers.<WmTask>lambdaQuery()
@@ -2655,7 +2485,7 @@ public class ApiController {
      */
     @Deprecated
     @GetMapping("/getHistoryTaskList1")
-    public R getHistoryTaskList1(Page page, WmTask wmTask) {
+    public R<?> getHistoryTaskList1(Page page, WmTask wmTask) {
         wmTask.setEnableFlag("0");
         wmTask.setDelFlag("0");
         UserDTO userDTO = new UserDTO();
@@ -2727,7 +2557,7 @@ public class ApiController {
      */
     @SysLog("任务-根据ID获取任务")
     @GetMapping("/getTaskInfoById")
-    public R getTaskInfoById(String taskId) {
+    public R<?> getTaskInfoById(String taskId) {
         Map<String, Object> map = new HashMap<>();
         WmTask wmTask = wmTaskService.getById(taskId);
         if (null != wmTask) {
@@ -2794,7 +2624,7 @@ public class ApiController {
      * @return R
      */
     @GetMapping("/getSignInfoByTaskId")
-    public R getSignInfoByTaskId(Integer id) {
+    public R<?> getSignInfoByTaskId(Integer id) {
         WmTask wmTask = wmTaskService.getById(id);
         if (null != wmTask) {
             if (null != wmTask.getTaskContentId()) {
@@ -2898,7 +2728,7 @@ public class ApiController {
      * @return R
      */
     @GetMapping("/getQrCodeByUrl")
-    public R getQrCodeByUrl(String url, int width, int height) throws FileNotFoundException {
+    public R<?> getQrCodeByUrl(String url, int width, int height) throws FileNotFoundException {
 
         String QR_CODE_IMAGE_PATH = OsEnvUtils.getEachEnvPaths().get("EXCEL_FILE_PATH") + "out/" + UUID.randomUUID() + ".png";
         try {
@@ -2979,7 +2809,7 @@ public class ApiController {
      */
     @SysLog("修改意见反馈")
     @PostMapping("/saveFeedBack")
-    public R saveFeedBack(@RequestBody WmFeedback wmFeedback) {
+    public R<?> saveFeedBack(@RequestBody WmFeedback wmFeedback) {
         return R.ok(wmFeedbackService.save(wmFeedback));
     }
 
@@ -2991,7 +2821,7 @@ public class ApiController {
      */
     @SysLog("分享名片接口")
     @GetMapping("/shareUserCard")
-    public R shareUserCard(String imgUrl) {
+    public R<?> shareUserCard(String imgUrl) {
         int socre = 0;
         SysUser sysUser = sysUserService.getById(SecurityUtils.getUser().getId());
 
@@ -3118,7 +2948,7 @@ public class ApiController {
      * @return
      */
     @GetMapping("/h5PackagePage")
-    public R h5PackagePage(Page page, WmScorePackage wmScorePackage) {
+    public R<?> h5PackagePage(Page page, WmScorePackage wmScorePackage) {
         String id = wmScorePackage.getId();
         if (StringUtils.isBlank(id)) {
             return R.failed("积分包ID不能为空");
@@ -3142,7 +2972,7 @@ public class ApiController {
      * @return
      */
     @GetMapping("/h5TaskPage")
-    public R h5TaskPage(Page page, WmTask wmTask) {
+    public R<?> h5TaskPage(Page page, WmTask wmTask) {
         if (StringUtils.isBlank(wmTask.getId())) {
             return R.failed("积分包ID不能为空");
         }
@@ -3163,7 +2993,7 @@ public class ApiController {
     @GetMapping("/getH5To")
     @SysLog("更新任务截图")
     @Inner(value = false)
-    public R getH5To(String taskId) {
+    public R<?> getH5To(String taskId) {
         WmTask wmTask = wmTaskService.getById(taskId);
         log.info("更新任务截图任务原数据:{}", wmTask);
         if (null == wmTask) {
@@ -3234,12 +3064,10 @@ public class ApiController {
 
     /**
      * 小程序去掉通知--不再提示
-     *
-     * @return
      */
     @SysLog("小程序去掉通知")
     @PostMapping("/removeNotice")
-    public R removeNotice(@RequestBody NoticeApiInput input) {
+    public R<?> removeNotice(@RequestBody NoticeApiInput input) {
         if (StringUtils.isEmpty(input.getUserId())) {
             return R.failed("参数异常，请求失败");
         }
@@ -3327,7 +3155,7 @@ public class ApiController {
      */
     @SysLog("获取登录人积分包（药品生产商发包或者cso单独发包")
     @GetMapping("/getPackageListByTaskTypeAndAlbumId")
-    public R getPackageListByTaskTypeAndAlbumId(String type, Integer albumId) {
+    public R<?> getPackageListByTaskTypeAndAlbumId(String type, Integer albumId) {
         if (StringUtils.isEmpty(type) || albumId == null) {
             return R.failed("参数异常，请求失败");
         }
@@ -3814,6 +3642,7 @@ public class ApiController {
      * @param pkgId      积分包id
      * @return 校验信息
      */
+    @SuppressWarnings("unchecked")
     private Boolean checkArticleOpenLimit(WmWkArticle article, SysUser user, WmTask task, String taskTypeId, String pkgId) {
         Assert.notNull(article);
 
@@ -3822,8 +3651,8 @@ public class ApiController {
         int maxShareTimes = upmsConfig.getMaxShareTimes();
         if (CollUtil.isNotEmpty(rules)) {
             // 获取限制
-            for (int i = 0, size = rules.size(); i < size; i++) {
-                Map<String, Object> map = (Map<String, Object>) rules.get(i);
+            for (WmTaskSubmissionRule.SubmissionRule rule : rules) {
+                Map<String, Object> map = (Map<String, Object>) rule;
                 WmTaskSubmissionRule.SubmissionRule r = BeanUtil.mapToBean(map, WmTaskSubmissionRule.SubmissionRule.class, true, new CopyOptions());
 
                 if ("同一个人对同一篇文章的转发上限".equals(r.getManual())) {
@@ -4043,7 +3872,7 @@ public class ApiController {
      * @return R(/ admin / bucketName / filename)
      */
     @PostMapping("/file/upload/mobile")
-    public R uploadForMobile(@RequestParam("file") MultipartFile file) throws IOException, NoSuchAlgorithmException {
+    public R<?> uploadForMobile(@RequestParam("file") MultipartFile file) throws IOException, NoSuchAlgorithmException {
 
         String originalFilename = file.getOriginalFilename();
 
@@ -4206,7 +4035,7 @@ public class ApiController {
         final String key = com.qunzhixinxi.hnqz.common.core.constant.CacheConstants.DEFAULT_CODE_KEY + LoginTypeEnum.SMS.getType() + StringPool.AT + username + "@fina";
 
 
-        Boolean res = redisTemplate.hasKey(key) ? code.equals(redisTemplate.opsForValue().get(key)) : Boolean.FALSE;
+        Boolean res = Boolean.TRUE.equals(redisTemplate.hasKey(key)) ? code.equals(redisTemplate.opsForValue().get(key)) : Boolean.FALSE;
 
         if (res) {
             redisTemplate.delete(key);
@@ -4300,7 +4129,7 @@ public class ApiController {
      * 获取当前积分包对应的积分规则
      *
      * @param packageId 积分包id
-     * @return
+     * @return 规则
      */
     @GetMapping("/package-rule-task-type/{packageId}")
     public R<?> getScorePackageRuleScore(@PathVariable("packageId") String packageId) {