feat: 小程序签署平台协议1

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

@@ -7,13 +7,14 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
-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.core.metadata.IPage;
@@ -34,7 +35,6 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysRole;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUserAgreementHistory;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmAdRecord;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmPkgQuizRelation;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmPlatformQuizTestResult;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmQuiz;
@@ -146,7 +146,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -236,7 +242,6 @@ public class ApiController {
     private final UpmsConfig upmsConfig;
     private final WmWkAlbumService wmWkAlbumService;
     private final WmUserSignDetailService wmUserSignDetailService;
-    private final WmAdRecordService adRecordService;
     private final SysUserExtRecordService sysUserExtRecordService;
     private final SysUserSubService sysUserSubService;
     private final WmTaskSubmissionRuleService taskSubmissionRuleService;
@@ -365,7 +370,7 @@ public class ApiController {
                                             Map<String, Object> map = new HashMap<>();
                                             map.put("label", wmScorePackage.getScorePackageName());
                                             map.put("value", wmScorePackage.getId());
-                                            String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage.getDrugProducerList());
+                                            String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrPool.COMMA, wmScorePackage.getDrugProducerList());
                                             map.put("drugProducer", drugProducer);
                                             listMap.add(map);
                                         }
@@ -385,7 +390,7 @@ public class ApiController {
                                             Map<String, Object> map = new HashMap<>(5);
                                             map.put("label", wmScorePackage.getScorePackageName());
                                             map.put("value", wmScorePackage.getId());
-                                            String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage.getDrugProducerList());
+                                            String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrPool.COMMA, wmScorePackage.getDrugProducerList());
                                             map.put("drugProducer", drugProducer);
                                             map.put("drugTableIds", wmScorePackage.getDrugtable());
                                             if (ArrayUtil.isNotEmpty(wmScorePackage.getDrugtable())) {
@@ -547,7 +552,7 @@ public class ApiController {
                                             Map<String, Object> map = new HashMap<>();
                                             map.put("label", wmScorePackage.getScorePackageName());
                                             map.put("value", wmScorePackage.getId());
-                                            String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage.getDrugProducerList());
+                                            String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrPool.COMMA, wmScorePackage.getDrugProducerList());
                                             map.put("drugProducer", drugProducer);
                                             listMap.add(map);
                                         }
@@ -567,7 +572,7 @@ public class ApiController {
                                             Map<String, Object> map = new HashMap<>(3);
                                             map.put("label", wmScorePackage.getScorePackageName());
                                             map.put("value", wmScorePackage.getId());
-                                            String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage.getDrugProducerList());
+                                            String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrPool.COMMA, wmScorePackage.getDrugProducerList());
                                             map.put("drugProducer", drugProducer);
                                             listMap.add(map);
                                         }
@@ -659,10 +664,10 @@ public class ApiController {
                         wmDaDrugEnts = getDrugListBySecUser(SecurityUtils.getUser().getPlatId());
                     }
                     List<Map<String, Object>> listMap = new ArrayList<>();
-                    for (int i = 0; i < wmDaDrugEnts.size(); i++) {
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("label", wmDaDrugEnts.get(i).getEntname());
-                        map.put("value", wmDaDrugEnts.get(i).getId());
+                    for (WmDaDrugEnt wmDaDrugEnt : wmDaDrugEnts) {
+                        Map<String, Object> map = new HashMap<>(3);
+                        map.put("label", wmDaDrugEnt.getEntname());
+                        map.put("value", wmDaDrugEnt.getId());
                         map.put("type", "drug");
                         listMap.add(map);
                     }
@@ -670,41 +675,37 @@ public class ApiController {
 
                     List<WmDaDistribution> wmDaDistributions = wmDaDistributionService.list();
                     List<Map<String, Object>> wmDaDistributionList = new ArrayList<>();
-                    for (int i = 0; i < wmDaDistributions.size(); i++) {
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("label", wmDaDistributions.get(i).getGsmc());
-                        map.put("value", wmDaDistributions.get(i).getId());
+                    for (WmDaDistribution wmDaDistribution : wmDaDistributions) {
+                        Map<String, Object> map = new HashMap<>(2);
+                        map.put("label", wmDaDistribution.getGsmc());
+                        map.put("value", wmDaDistribution.getId());
                         wmDaDistributionList.add(map);
                     }
                     dictMap.put("distribution_service", listMap);
                 } else if ("ent_bus".equals(config.getDictGroupName())) {
                     List<WmDaDistribution> wmDaDrugEnts = wmDaDistributionService.list();
                     List<Map<String, Object>> listMap = new ArrayList<>();
-                    for (int i = 0; i < wmDaDrugEnts.size(); i++) {
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("label", wmDaDrugEnts.get(i).getGsmc());
-                        map.put("value", wmDaDrugEnts.get(i).getId());
+                    for (WmDaDistribution wmDaDrugEnt : wmDaDrugEnts) {
+                        Map<String, Object> map = new HashMap<>(2);
+                        map.put("label", wmDaDrugEnt.getGsmc());
+                        map.put("value", wmDaDrugEnt.getId());
                         listMap.add(map);
                     }
                     dictMap.put(config.getDictGroupName(), listMap);
                 } else if ("ent_pharmacy".equals(config.getDictGroupName())) {
                     List<WmDaPharmacy> wmDaDrugEnts = wmDaPharmacyService.list();
                     List<Map<String, Object>> listMap = new ArrayList<>();
-                    for (int i = 0; i < wmDaDrugEnts.size(); i++) {
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("label", wmDaDrugEnts.get(i).getPharmacyName());
-                        map.put("value", wmDaDrugEnts.get(i).getId());
+                    for (WmDaPharmacy wmDaDrugEnt : wmDaDrugEnts) {
+                        Map<String, Object> map = new HashMap<>(2);
+                        map.put("label", wmDaDrugEnt.getPharmacyName());
+                        map.put("value", wmDaDrugEnt.getId());
                         listMap.add(map);
                     }
                     dictMap.put(config.getDictGroupName(), listMap);
                 } else if ("package_list".equals(config.getDictGroupName())) {
-                    /**
-                     * 查询可以关联的积分包
-                     */
+                    // 查询可以关联的积分包
                     List<Map<String, Object>> listMap = new ArrayList<>();
-                    if (null == SecurityUtils.getUser()) {
-
-                    } else {
+                    if (SecurityUtils.getUser() != null) {
                         UserVO userVO = sysUserService.selectUserVoById(SecurityUtils.getUser().getId());
                         WmScorePackageStatus query = new WmScorePackageStatus();
                         query.setUserId(userVO.getUserId() + "");
@@ -753,15 +754,6 @@ public class ApiController {
                                         map.put("value", wmScorePackage.getId());
                                         listMap.add(map);
                                     }
-//									List<WmScoreTaskType> taskTypes = wmScoreTaskTypeService.
-//											list(Wrappers.query(taskType));
-//
-//									if (CollectionUtils.isNotEmpty(taskTypes)) {
-//										Map<String, Object> map = new HashMap<>();
-//										map.put("label", wmScorePackage.getScorePackageName());
-//										map.put("value", wmScorePackage.getId());
-//										listMap.add(map);
-//									}
                                 }
 
                             }
@@ -782,7 +774,7 @@ public class ApiController {
     @GetMapping("/getDeptBuildName/{deptId}")
     public R<?> getDeptBuildName(@PathVariable String deptId) {
         Map<String, Object> connfigMap = new LinkedHashMap<>();
-        if (null == deptId || "".equals(deptId)) {
+        if (CharSequenceUtil.isBlank(deptId)) {
             return R.failed("deptId不能为空");
         }
 
@@ -802,11 +794,11 @@ public class ApiController {
 
         SysUser updateU = new SysUser();
         updateU.setUserId(uId);
-        if (StrUtil.isBlank(u.getWxOpenid()) || "null".equals(u.getWxOpenid())) {
+        if (CharSequenceUtil.isBlank(u.getWxOpenid()) || "null".equals(u.getWxOpenid())) {
             updateU.setWxOpenid(openId);
         }
 
-        if (StrUtil.isBlank(u.getAvatar())) {
+        if (CharSequenceUtil.isBlank(u.getAvatar())) {
             updateU.setAvatar(avatar);
         }
 
@@ -852,7 +844,7 @@ public class ApiController {
             mapOne.put("reSignedAgreement", sysU.getReSignedAgreement());
 
             // 设置头像
-            if (StrUtil.isBlank(sysU.getAvatar())) {
+            if (CharSequenceUtil.isBlank(sysU.getAvatar())) {
                 SysUser u = new SysUser();
                 u.setUserId(sysU.getUserId());
                 u.setAvatar(avatar);
@@ -1055,7 +1047,7 @@ public class ApiController {
         if (CollUtil.isNotEmpty(taskTypeList)) {
             taskTypeList.forEach(taskType -> {
                 WmTaskTypeVO taskTypeVO = BeanUtil.copyProperties(taskType, WmTaskTypeVO.class, "score");
-                if (StrUtil.isNotBlank(taskType.getTaskTypeName()) && taskType.getTaskTypeName().startsWith("应收账款回款")) {
+                if (CharSequenceUtil.isNotBlank(taskType.getTaskTypeName()) && taskType.getTaskTypeName().startsWith("应收账款回款")) {
                     // 应收账款回款 任务类 保存的是1000倍数，需要转换回来
                     taskTypeVO.setScore(String.valueOf(taskType.getScore() / 1000.0D));
                 } else {
@@ -1093,7 +1085,7 @@ public class ApiController {
         if (CollUtil.isNotEmpty(wmTaskTypeList)) {
             wmTaskTypeList.forEach(taskType -> {
                 WmTaskTypeVO typeVO = BeanUtil.copyProperties(taskType, WmTaskTypeVO.class, "score");
-                if (StrUtil.isNotBlank(taskType.getTaskTypeName()) && taskType.getTaskTypeName().startsWith("应收账款回款")) {
+                if (CharSequenceUtil.isNotBlank(taskType.getTaskTypeName()) && taskType.getTaskTypeName().startsWith("应收账款回款")) {
                     // 应收账款回款 任务类 保存的是1000倍数，需要转换回来
                     typeVO.setScore(String.valueOf(taskType.getScore() / 1000.0D));
                 } else {
@@ -1155,15 +1147,15 @@ public class ApiController {
 
         log.info("三方平台提交任务，入参：{}", resource);
 
-        if (StrUtil.isBlank(resource.getTaskTypeId())) {
+        if (CharSequenceUtil.isBlank(resource.getTaskTypeId())) {
             return R.failed("任务类型不能为空");
         }
 
-        if (StrUtil.isBlank(resource.getPkgName()) && StrUtil.isBlank(resource.getPkgId())) {
+        if (CharSequenceUtil.isBlank(resource.getPkgName()) && CharSequenceUtil.isBlank(resource.getPkgId())) {
             return R.failed("关联积分包不能为空, 必须指定ID或者名称");
         }
 
-        if (StrUtil.isBlank(resource.getUsername())) {
+        if (CharSequenceUtil.isBlank(resource.getUsername())) {
             return R.failed("代表手机号必填");
         }
 
@@ -1233,11 +1225,11 @@ public class ApiController {
             return R.failed(ducImgUrl, "提交重复的图片");
         }
 
-        if (StrUtil.isBlank(wmTaskContent.getTemp30())) {
+        if (CharSequenceUtil.isBlank(wmTaskContent.getTemp30())) {
             return R.failed("任务类型不能为空");
         }
 
-        if (StrUtil.isBlank(wmTaskContent.getTemp32())) {
+        if (CharSequenceUtil.isBlank(wmTaskContent.getTemp32())) {
             return R.failed("关联积分包不能为空");
         }
 
@@ -1263,7 +1255,7 @@ public class ApiController {
                     R<?> r1 = wmTaskContentService.saveTaskContent(wmTaskContent, ipAddr, finalRegion);
                     Map<String, String> data = (Map<String, String>) r1.getData();
                     String s = data.get("score");
-                    if (StrUtil.isNotBlank(s)) {
+                    if (CharSequenceUtil.isNotBlank(s)) {
                         score.addAndGet(Integer.parseInt(s));
                     }
 
@@ -1280,7 +1272,7 @@ public class ApiController {
             return R.failed(e.getMessage());
         } finally {
             log.info("结果:{}, 草稿key:{}", r, draftKey);
-            if (r != null && r.getCode() == CommonConstants.SUCCESS && StrUtil.isNotEmpty(draftKey)) {
+            if (r != null && r.getCode() == CommonConstants.SUCCESS && CharSequenceUtil.isNotEmpty(draftKey)) {
                 String key = String.format(CacheConstants.TASK_CONTENT_DRAFT, taskTypeId, id);
                 log.info("删除草稿:{}", key);
                 redisTemplate.delete(key);
@@ -1297,7 +1289,7 @@ public class ApiController {
             }
 
             // 获取签到key
-            if (StrUtil.isNotBlank(locationId)) {
+            if (CharSequenceUtil.isNotBlank(locationId)) {
                 String cacheKey = String.format("user:sign:temp:%s:%s", id, locationId);
                 redisTemplate.delete(cacheKey);
             }
@@ -1312,12 +1304,12 @@ public class ApiController {
 
         if (contentValue.startsWith("/admin/sys-file/wmkj")) {
 
-            List<String> split = StrUtil.split(contentValue, StrUtil.COMMA);
+            List<String> split = CharSequenceUtil.split(contentValue, StrPool.COMMA);
 
             List<String> IMG_EXT_NAME = Arrays.asList("png", "jpg", "gif", "jpeg", "tif", "bmp");
 
             split.forEach(item -> {
-                List<String> temp = StrUtil.split(item, StrUtil.DOT);
+                List<String> temp = CharSequenceUtil.split(item, StrUtil.DOT);
                 String extName = temp.get(temp.size() - 1);
 
                 if (IMG_EXT_NAME.contains(extName.toLowerCase())) {
@@ -1329,7 +1321,7 @@ public class ApiController {
                         byte[] digest = md5.digest(bytes);
                         String hash = new BigInteger(1, digest).toString(16);
                         log.info("图片md5:{}", hash);
-                        Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(String.format("%s:%s", userId, hash), item);
+                        boolean aBoolean = Boolean.TRUE.equals(redisTemplate.opsForValue().setIfAbsent(String.format("%s:%s", userId, hash), item));
                         if (!aBoolean) {
                             log.error("上传了重复的图片, hash:{}", hash);
                             errorHash.add(hash);
@@ -1339,7 +1331,7 @@ public class ApiController {
                             log.info("hash:{}, size:{}, list:{}", hash, all.size(), all);
                         }
                     } catch (IOException | URISyntaxException | NoSuchAlgorithmException e) {
-                        e.printStackTrace();
+                        log.error("Oops！发生了错误", e);
                     }
 
                 }
@@ -1478,7 +1470,7 @@ public class ApiController {
     public R<?> getWmWkAlbumPage(Page<WmWkAlbum> page, WmWkAlbum wmWkAlbum, String shareUserId) {
 
         // 查询当前登录人药企的
-        System.out.println(shareUserId);
+        log.info("share_user_id:{}", shareUserId);
         if (StringUtils.isNotEmpty(shareUserId)) {
             WmWkAlbumApiInput input = new WmWkAlbumApiInput();
             SysUser sysUser = sysUserService.getById(shareUserId);
@@ -1523,6 +1515,7 @@ public class ApiController {
     public R<?> getAlbumPageNew(Page page, WmWkAlbum wmWkAlbum, String shareUserId) {
 
         // 查询当前登录人药企的
+
         System.out.println(shareUserId);
         if (StringUtils.isNotEmpty(shareUserId)) {
             WmWkAlbumApiInput input = new WmWkAlbumApiInput();
@@ -1933,8 +1926,8 @@ public class ApiController {
                         continue;
                     }
 
-                    if (StrUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), item.getPackageType1())
-                            || StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), item.getPackageType1())) {
+                    if (CharSequenceUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), item.getPackageType1())
+                            || CharSequenceUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), item.getPackageType1())) {
                         Integer finishScore = 0;
                         Integer waitApprovalScore = 0;
                         for (WmTask task : wmTaskList) {
@@ -2074,95 +2067,6 @@ public class ApiController {
         return R.ok(map);
     }
 
-
-    /**
-     * 小程序领取积分包
-     * <p>
-     * 垃圾逻辑，配合试卷提交废弃
-     *
-     * @param packageId 积分包id
-     * @return R
-     */
-    @Deprecated
-    @GetMapping("/receivePackage")
-    public R<?> receivePackage(String packageId) {
-        WmScorePackage wmScorePackage = wmScorePackageService.getById(packageId);
-        if (null == wmScorePackage) {
-            return R.failed("积分包不存在");
-        }
-
-        if ("1".equals(wmScorePackage.getEnableFlag())) {
-            return R.failed("积分包已终止，不能领取");
-        }
-
-        if (!"0".equals(wmScorePackage.getEnableType())) {
-            return R.failed("积分包剩余积分值已收回，不能领取");
-        }
-
-        if ("1".equals(wmScorePackage.getIsReceive())) {
-            return R.failed("积分包不能领取");
-        }
-
-        UserVO userVO = sysUserService.selectUserVoById(SecurityUtils.getUser().getId());
-        if (null == userVO) {
-            return R.failed("账号出错");
-        }
-        if (isZbRole(userVO.getRoleList(), 5)) {
-            return R.failed("全职学术推广员不能领取积分包");
-        }
-
-        // 校验超过60周岁,不能做任务
-        Map<String, String> checkResult = sysUserService.checkSixtyYearsOld(userVO);
-        if (CollUtil.isNotEmpty(checkResult) && checkResult.containsKey("OVER")) {
-            throw new RuntimeException(checkResult.get("OVER"));
-        }
-
-        WmScorePackageStatus wmScorePackageStatus = new WmScorePackageStatus();
-        wmScorePackageStatus.setPackageId(packageId);
-        wmScorePackageStatus.setUserId(userVO.getUserId() + "");
-        wmScorePackageStatus.setDelFlag("0");
-        wmScorePackageStatus.setEnableFlag("0");
-        List<WmScorePackageStatus> wmScorePackageStatusList = wmScorePackageStatusService.
-                list(Wrappers.query(wmScorePackageStatus).lambda().ne(WmScorePackageStatus::getStatus, 3));
-        if (wmScorePackageStatusList.size() > 0) {
-            return R.failed("积分包已领取");
-        }
-
-        wmScorePackageStatus.setStatus("1");
-        wmScorePackageStatus.setTaskAddFlag("1");
-        if (PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(wmScorePackage.getPackageType1())
-                || PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
-            wmScorePackageStatus.setUserScore(wmScorePackage.getScore() + "");
-        } else {
-            wmScorePackageStatus.setUserScore(wmScorePackage.getUserScore());
-        }
-        wmScorePackageStatus.setTaskNum(wmScorePackage.getTaskNum());
-        wmScorePackageStatus.setDeptId(userVO.getDeptId() + "");
-        LocalDateTime localDateTime = LocalDateTime.now();
-        wmScorePackageStatus.setCreateTime(localDateTime);
-        wmScorePackageStatus.setUpdateTime(localDateTime);
-        wmScorePackageStatusService.save(wmScorePackageStatus);
-
-        WmScorePackageStatus query = new WmScorePackageStatus();
-        query.setPackageId(packageId);
-        query.setStatus("1");
-        query.setDelFlag("0");
-        query.setEnableFlag("0");
-        int total = wmScorePackageStatusService.count(Wrappers.query(query));
-
-        // 显示用的
-        if (total == 1) {
-            WmScorePackage update = new WmScorePackage();
-            update.setId(wmScorePackage.getId());
-            update.setScorePackageStatus("2");
-            update.setIsConduct("1");
-            wmScorePackageService.updateById(update);
-        }
-
-        return R.ok();
-
-    }
-
     /**
      * 小程序领取积分包
      *
@@ -2329,7 +2233,7 @@ public class ApiController {
         queryWrapper.eq(WmTask::getTaskUserId, userId);
         queryWrapper.ne(WmTask::getScore, 0);
         queryWrapper.orderByDesc(WmTask::getCreateTime);
-        if (StrUtil.isNotBlank(wmTask.getTaskRuleId())) {
+        if (CharSequenceUtil.isNotBlank(wmTask.getTaskRuleId())) {
             queryWrapper.like(WmTask::getLookintoDate, wmTask.getTaskRuleId());
         }
 
@@ -2450,7 +2354,7 @@ public class ApiController {
                 if ("16".equals(wmTask.getTaskTypeId())) {
                     wmTaskContent.setTemp31(wmTaskContent.getTemp4());
                 }
-                if (StrUtil.isNotBlank(wmTaskContent.getTemp24())) {
+                if (CharSequenceUtil.isNotBlank(wmTaskContent.getTemp24())) {
                     WmDaHospital hospital = wmDaHospitalService.getById(wmTaskContent.getTemp24());
                     if (hospital != null) {
                         wmTaskContent.setTemp24label(hospital.getYymc());
@@ -2541,7 +2445,7 @@ public class ApiController {
                                     userSignDetail.setPurposeName(purposeNameArr);
                                 }
                             }
-                            if (StrUtil.isNotBlank(userSignDetail.getResult())) {
+                            if (CharSequenceUtil.isNotBlank(userSignDetail.getResult())) {
                                 userSignDetail.setResultName(Objects.requireNonNull(UserSignResultEnum.resolve(userSignDetail.getResult())).getName());
                             }
 
@@ -2665,7 +2569,7 @@ public class ApiController {
         sysUser.setAvatar(userUpdateInput.getAvatar());
 
         // 姓名去除空格（包括字符之间的所有空格都会去除）
-        sysUser.setRealname(StrUtil.cleanBlank(userUpdateInput.getRealname()));
+        sysUser.setRealname(CharSequenceUtil.cleanBlank(userUpdateInput.getRealname()));
         sysUser.setUserSign(userUpdateInput.getUserSign());
         sysUserService.updateById(sysUser);
 
@@ -2698,103 +2602,101 @@ public class ApiController {
         int socre = 0;
         SysUser sysUser = sysUserService.getById(SecurityUtils.getUser().getId());
 
-        if (sysUser == sysUser) {
-            List<SysUser> listUsers = sysUserService.getUserByPlatId(sysUser.getPlatId());
-            if (listUsers.size() > 0) {
-                for (SysUser sysU : listUsers) {
-                    WmWkArticleShare wmWkArticleShare = new WmWkArticleShare();
-                    wmWkArticleShare.setShareUserid(sysU.getUserId() + "");
-                    wmWkArticleShare.setShareType("1");
-                    wmWkArticleShare.setCreateTime(LocalDateTime.now());
-                    wmWkArticleShare.setArctileId(imgUrl);
-                    wmWkArticleShareService.save(wmWkArticleShare);
+        List<SysUser> listUsers = sysUserService.getUserByPlatId(sysUser.getPlatId());
+        if (CollUtil.isNotEmpty(listUsers)) {
+            for (SysUser sysU : listUsers) {
+                WmWkArticleShare wmWkArticleShare = new WmWkArticleShare();
+                wmWkArticleShare.setShareUserid(sysU.getUserId() + "");
+                wmWkArticleShare.setShareType("1");
+                wmWkArticleShare.setCreateTime(LocalDateTime.now());
+                wmWkArticleShare.setArctileId(imgUrl);
+                wmWkArticleShareService.save(wmWkArticleShare);
 
 
-                    WmTask wmTask = new WmTask();
-                    wmTask.setTaskFrom("1");
-                    wmTask.setTaskUserId(sysU.getUserId() + "");  // 任务提交人
-                    wmTask.setLookintoDate(LocalDateTime.now());       // 调研时间
-                    wmTask.setTaskStatus("1");
-                    wmTask.setSubmitStatus("0");
-                    wmTask.setDrugEntId(sysU.getDrugEntId());// 任务状态
-                    wmTask.setTaskTypeId("7");
-                    wmTask.setShareImgUrl(imgUrl);
-
-                    SysDept sysDept = sysDeptService.getById(sysU.getDeptId());
-                    WmTaskType wmTaskType = new WmTaskType();
-                    wmTaskType.setDurgentId(sysU.getDrugEntId());
-                    WmTaskType wmTaskType1 = wmTaskTypeService.getById("7");
-                    wmTaskType.setTaskTypeName(wmTaskType1.getTaskTypeName());
-                    wmTaskType.setTaskEntId(sysDept.getLevel2Id());
-                    socre = wmTaskTypeService.getWmTaskTypeByEnt(wmTaskType);
-                    System.out.println("获取任务得分：" + socre);
-                    if (socre < 0) {
-                        return R.failed("获取任务积分失败");
-                    }
-                    wmTask.setScore(socre);
+                WmTask wmTask = new WmTask();
+                wmTask.setTaskFrom("1");
+                wmTask.setTaskUserId(sysU.getUserId() + "");  // 任务提交人
+                wmTask.setLookintoDate(LocalDateTime.now());       // 调研时间
+                wmTask.setTaskStatus("1");
+                wmTask.setSubmitStatus("0");
+                wmTask.setDrugEntId(sysU.getDrugEntId());// 任务状态
+                wmTask.setTaskTypeId("7");
+                wmTask.setShareImgUrl(imgUrl);
+
+                SysDept sysDept = sysDeptService.getById(sysU.getDeptId());
+                WmTaskType wmTaskType = new WmTaskType();
+                wmTaskType.setDurgentId(sysU.getDrugEntId());
+                WmTaskType wmTaskType1 = wmTaskTypeService.getById("7");
+                wmTaskType.setTaskTypeName(wmTaskType1.getTaskTypeName());
+                wmTaskType.setTaskEntId(sysDept.getLevel2Id());
+                socre = wmTaskTypeService.getWmTaskTypeByEnt(wmTaskType);
+                System.out.println("获取任务得分：" + socre);
+                if (socre < 0) {
+                    return R.failed("获取任务积分失败");
+                }
+                wmTask.setScore(socre);
 
-                    WmScorePackage wmScorePackage = new WmScorePackage();
-                    if (SecurityUtils.getRoles().contains(6)) {
-                        wmScorePackage.setZbId(sysU.getUserId() + "");
-                    } else {
-                        wmScorePackage.setXxdbId(sysU.getUserId() + "");
-                    }
+                WmScorePackage wmScorePackage = new WmScorePackage();
+                if (SecurityUtils.getRoles().contains(6)) {
+                    wmScorePackage.setZbId(sysU.getUserId() + "");
+                } else {
+                    wmScorePackage.setXxdbId(sysU.getUserId() + "");
+                }
 
-                    wmScorePackage.setDrugEntId(sysU.getDrugEntId());
-                    WmScorePackage tWmScorePackage = wmScorePackageService.getPackageScoreByTaskInfo(wmScorePackage);
-                    try {
-                        String packageEntId = wmScorePackageService.getPackageScoreEntByTaskInfo(wmScorePackage);
-                        wmTask.setScorePackageLevel1Id(packageEntId);
-                    } catch (Exception ex) {
+                wmScorePackage.setDrugEntId(sysU.getDrugEntId());
+                WmScorePackage tWmScorePackage = wmScorePackageService.getPackageScoreByTaskInfo(wmScorePackage);
+                try {
+                    String packageEntId = wmScorePackageService.getPackageScoreEntByTaskInfo(wmScorePackage);
+                    wmTask.setScorePackageLevel1Id(packageEntId);
+                } catch (Exception ex) {
 
-                    }
-                    System.out.println("获取积分包ID：" + tWmScorePackage);
-                    if (null == tWmScorePackage) {
-                        // return R.failed("获取积分包失败");
-                    } else {
-                        wmTask.setScorePackageId(tWmScorePackage.getId());
-                        wmTask.setTaskRuleId(tWmScorePackage.getTaskRuleId());
-                    }
+                }
+                System.out.println("获取积分包ID：" + tWmScorePackage);
+                if (null == tWmScorePackage) {
+                    // return R.failed("获取积分包失败");
+                } else {
+                    wmTask.setScorePackageId(tWmScorePackage.getId());
+                    wmTask.setTaskRuleId(tWmScorePackage.getTaskRuleId());
+                }
 
-                    wmTask.setTaskContentId(wmWkArticleShare.getId() + "");
+                wmTask.setTaskContentId(wmWkArticleShare.getId() + "");
 
-                    if (SecurityUtils.getRoles().contains(5)) {
-                        wmTask.setTaskUserType("5");
-                    }
+                if (SecurityUtils.getRoles().contains(5)) {
+                    wmTask.setTaskUserType("5");
+                }
 
-                    wmTask.setCreateTime(LocalDateTime.now());
+                wmTask.setCreateTime(LocalDateTime.now());
 
-                    if (SecurityUtils.getRoles().contains(6)) {
-                        wmTask.setTaskUserType("6");
-                    }
+                if (SecurityUtils.getRoles().contains(6)) {
+                    wmTask.setTaskUserType("6");
+                }
 
-                    wmTask.setDeptId(sysU.getDeptId() + "");
-                    wmTask.setSubmitStatus("0");
-                    wmTask.setTaskNumber(taskSequence.nextNo());
-                    boolean isSave = wmTaskService.save(wmTask);   // 保存任务
+                wmTask.setDeptId(sysU.getDeptId() + "");
+                wmTask.setSubmitStatus("0");
+                wmTask.setTaskNumber(taskSequence.nextNo());
+                boolean isSave = wmTaskService.save(wmTask);   // 保存任务
 
-                    // 判断任务是否完成
-                    if (isSave && null != tWmScorePackage) {
-                        WmScorePackage wmScorePackage1 = wmScorePackageService.getById(tWmScorePackage.getId());
-                        if (null != wmScorePackage1) {
-                            WmTask wmTask1 = new WmTask();
-                            wmTask1.setScorePackageId(tWmScorePackage.getId());
-                            wmTask1.setDrugEntId(sysU.getDrugEntId());
-                            List<WmTask> wmTaskList = wmTaskService.list(Wrappers.query(wmTask1));
-                            int totalCount = 0;
-                            for (WmTask wmtask : wmTaskList) {
-                                totalCount += wmtask.getScore();
-                            }
+                // 判断任务是否完成
+                if (isSave && null != tWmScorePackage) {
+                    WmScorePackage wmScorePackage1 = wmScorePackageService.getById(tWmScorePackage.getId());
+                    if (null != wmScorePackage1) {
+                        WmTask wmTask1 = new WmTask();
+                        wmTask1.setScorePackageId(tWmScorePackage.getId());
+                        wmTask1.setDrugEntId(sysU.getDrugEntId());
+                        List<WmTask> wmTaskList = wmTaskService.list(Wrappers.query(wmTask1));
+                        int totalCount = 0;
+                        for (WmTask wmtask : wmTaskList) {
+                            totalCount += wmtask.getScore();
+                        }
 
-                            if (totalCount >= wmScorePackage1.getScore()) {
-                                wmScorePackage1.setPackageFinishStatus("1");
-                            }
-                            wmScorePackage1.setIsConduct("1");
-                            wmScorePackageService.updateById(wmScorePackage1);
+                        if (totalCount >= wmScorePackage1.getScore()) {
+                            wmScorePackage1.setPackageFinishStatus("1");
                         }
-                    } else {
-                        return R.failed("任务保存失败");
+                        wmScorePackage1.setIsConduct("1");
+                        wmScorePackageService.updateById(wmScorePackage1);
                     }
+                } else {
+                    return R.failed("任务保存失败");
                 }
             }
         }
@@ -2890,7 +2792,7 @@ public class ApiController {
             InputStream inputStream = new ByteArrayInputStream(bs.toByteArray());
 
             String path = sysFileService.uploadImgByByte(inputStream);
-            if (StrUtil.isNotBlank(path)) {
+            if (CharSequenceUtil.isNotBlank(path)) {
                 WmTask updateTask = new WmTask();
                 updateTask.setId(wmTask.getId());
                 updateTask.setTaskInfoImg(path);
@@ -3007,7 +2909,7 @@ public class ApiController {
             Map<String, Object> map = new HashMap<>(5);
             map.put("label", wmScorePackage.getScorePackageName());
             map.put("value", wmScorePackage.getId());
-            String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage.getDrugProducerList());
+            String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrPool.COMMA, wmScorePackage.getDrugProducerList());
             map.put("drugProducer", drugProducer);
             map.put("deptId", wmScorePackage.getDeptId());
             map.put("relDeptId", wmScorePackage.getRelatedService());
@@ -3183,8 +3085,8 @@ public class ApiController {
                     }
                 }
 
-                if (StrUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), tWmScorePackage.getPackageType1())
-                        || StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), tWmScorePackage.getPackageType1())) {
+                if (CharSequenceUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), tWmScorePackage.getPackageType1())
+                        || CharSequenceUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), tWmScorePackage.getPackageType1())) {
 
                     wmTaskContentService.limitScore(sysUser.getUserId(), sysUser.getDeptId(), tWmScorePackage.getPackageType1());
                 }
@@ -3396,7 +3298,7 @@ public class ApiController {
                                 .ne(WmTask::getTaskStatus, "4")
                                 .eq(WmTask::getRealFlag, "0"));
                         // 判断定量还是定额 1- 定额   2-定量 6-定额+定量
-                        if (StrUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), wmScorePackage1.getPackageType1())) {
+                        if (CharSequenceUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), wmScorePackage1.getPackageType1())) {
 
                             int totalCount = 0;
                             for (WmTask wmtask : wmTaskList) {
@@ -3408,7 +3310,7 @@ public class ApiController {
                                 scorePackageStatus.setTaskAddFlag("0");
                                 wmScorePackageStatusService.updateById(scorePackageStatus);
                             }
-                        } else if (StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), wmScorePackage1.getPackageType1())) {
+                        } else if (CharSequenceUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), wmScorePackage1.getPackageType1())) {
                             // 多人积分包处理
                             int totalCount = 0;
                             for (WmTask wmtask : wmTaskList) {
@@ -3549,7 +3451,8 @@ public class ApiController {
      * @param pkgId      积分包id
      * @return 校验信息
      */
-    private Boolean checkAlbumOpenLimit(WmWkAlbum album, SysUser user, WmTask task, String taskTypeId, String pkgId) {
+    @SuppressWarnings("unchecked")
+    private boolean checkAlbumOpenLimit(WmWkAlbum album, SysUser user, WmTask task, String taskTypeId, String pkgId) {
         Assert.notNull(album);
 
         List<WmTaskSubmissionRule.SubmissionRule> rules = wmTaskContentService.getTaskSubmissionRule(taskTypeId, pkgId);
@@ -3607,6 +3510,7 @@ public class ApiController {
      * @param pkgId       积分包id
      * @return 校验信息
      */
+    @SuppressWarnings("unchecked")
     private String checkArticleLimit(WmWkArticle wmWkArticle, SysUser sysUser, String taskTypeId, String pkgId) {
         Assert.notNull(wmWkArticle);
 
@@ -3660,6 +3564,7 @@ public class ApiController {
      * @param pkgId      积分包id
      * @return 校验结果信息
      */
+    @SuppressWarnings("unchecked")
     private String checkAlbumLimit(WmWkAlbum wmWkAlbum, SysUser sysUser, String taskTypeId, String pkgId) {
 
         Assert.notNull(wmWkAlbum);
@@ -3669,8 +3574,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())) {
@@ -3690,23 +3595,20 @@ public class ApiController {
             List<WmDaDrugEntDrugtable> drugTableList =
                     wmDaDrugEntDrugtableService.listByIds(Arrays.asList(wmWkAlbum.getGlyp().split(",")));
             if (CollectionUtils.isNotEmpty(drugTableList)) {
-                /**
-                 * 2020-12-13 修改
-                 * 需求有逻辑BUG
-                 */
+
+                // 2020-12-13 修改 需求有逻辑BUG
                 String date = DateUtil.today() + ":";
-                System.err.println("DateUtil.today():" + date);
+                log.error("DateUtil.today():{}", date);
 
                 Set<String> drugEntIds = drugTableList.stream()
-                        .filter(drugTable -> StrUtil.isNotBlank(drugTable.getDrugEntId()))
                         .map(WmDaDrugEntDrugtable::getDrugEntId)
+                        .filter(CharSequenceUtil::isNotBlank)
                         .collect(Collectors.toSet());
 
                 for (String drugEntId : drugEntIds) {
 
-                    String key = CacheConstants.DRUG_ENT_PERSONAL_SHARE_KEY1 + date
-                            + drugEntId + CacheConstants.DRUG_ENT_PERSONAL_SHARE_KEY2 + sysUser.getUserId();
-                    System.err.println("key" + key);
+                    String key = CacheConstants.DRUG_ENT_PERSONAL_SHARE_KEY1 + date + drugEntId + CacheConstants.DRUG_ENT_PERSONAL_SHARE_KEY2 + sysUser.getUserId();
+                    log.info("key:{}", key);
                     if (Boolean.TRUE.equals(redisTemplate.hasKey(key))) {
                         int times = Integer.parseInt(redisTemplate.opsForValue().get(key).toString());
                         if (times >= maxShareTimes) {
@@ -3747,7 +3649,6 @@ public class ApiController {
             if (user == null) {
                 return R.failed("无法获取用户id");
             }
-            Integer id = user.getId();
 
             // 文件md5
 
@@ -3762,96 +3663,6 @@ public class ApiController {
         return sysFileService.uploadFile(file);
     }
 
-    /**
-     * 记录广告点击情况
-     *
-     * @param json 请求参数
-     * @return 记录结果
-     */
-    @PostMapping(value = "/ad-record")
-    @Transactional(rollbackFor = Exception.class)
-    public R<Boolean> insertAdRecord(@RequestBody String json) {
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        WmAdRecord record = new WmAdRecord();
-        record.setUrl(jsonObject.getString("url"));
-        record.setUserId(SecurityUtils.getUser().getId());
-        return R.failed(adRecordService.save(record));
-    }
-
-    /**
-     * 获取e-token
-     * <p>
-     * 每人每天最多获取5次
-     *
-     * @return e-token
-     */
-    @SysLog("获取e-token")
-    @GetMapping(value = "/eid")
-    public R<?> getEidToken(@RequestParam(value = "idCard") String idCard,
-                            @RequestParam(value = "realName") String realName,
-                            @RequestParam(value = "endType", required = false) String endType) {
-
-        if (StrUtil.isBlank(endType)) {
-            endType = upmsConfig.getEndType();
-        }
-
-        String tokenUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/eid?idCard={idCard}&realName={realName}&endType={endType}";
-
-        ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(tokenUrl, String.class, idCard, realName, endType);
-
-        log.info("获取e-token：{}", tokenResult.getBody());
-
-        cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(tokenResult.getBody());
-
-        return R.builder().code(jsonObject.getInt("code")).msg(jsonObject.getStr("msg")).data(jsonObject.getStr("data")).build();
-
-
-    }
-
-
-    /**
-     * 获取合身视频结果
-     *
-     * @param token e-token
-     * @return 合身视频结果
-     */
-    @SysLog("获取e-token合身视频结果")
-    @GetMapping(value = "/eid/result")
-    public R<?> getEidResult(@RequestParam(value = "token") String token,
-                             @RequestParam(value = "endType", required = false) String endType) {
-
-        if (StrUtil.isBlank(endType)) {
-            endType = upmsConfig.getEndType();
-        }
-
-        String tokenUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/eid/result?token={token}&endType={endType}";
-
-        ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(tokenUrl, String.class, token, endType);
-
-        log.info("获取e-token认证结果：{}", tokenResult.getBody());
-
-        cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(tokenResult.getBody());
-
-        if (CommonConstants.SUCCESS.equals(jsonObject.getInt("code"))) {
-            cn.hutool.json.JSONObject data = jsonObject.getJSONObject("data");
-            if (data != null) {
-                if (CommonConstants.SUCCESS.equals(data.getInt("compareCode"))) {
-
-                    Boolean absent = redisTemplate.opsForValue()
-                            .setIfAbsent(CacheConstants.EID_RESULT_KEY + token, tokenResult.getBody(), 30, TimeUnit.SECONDS);
-                    if (absent) {
-                        // 认证成功，则保存
-                        sysUserExtRecordService.eidResultHandler(data);
-                    }
-                }
-            }
-        }
-
-        return R.builder().code(jsonObject.getInt("code")).msg(jsonObject.getStr("msg")).data(jsonObject.getObj("data")).build();
-
-
-    }
-
     /**
      * 获取任务类型的小程序端限制规则
      *
@@ -3930,14 +3741,14 @@ public class ApiController {
         List<WmScorePackage> packages = wmScorePackageService.listByIds(ids);
         // 转为map key-积分包id，value-积分包名称
         Map<String, String> packageMap = packages.stream()
-                .filter(pkg -> StrUtil.split(status.getScorePackageStatus(), StrUtil.COMMA).contains(pkg.getScorePackageStatus()))
+                .filter(pkg -> CharSequenceUtil.split(status.getScorePackageStatus(), StrPool.COMMA).contains(pkg.getScorePackageStatus()))
                 .filter(pkg -> {
                     if (PersonalScoreRecordVO.PersonalScoreRecordStatus.PAID.getSettleStatus().equals(String.valueOf(pkg.getSettleStatus()))) {
                         // 如果条件是已结算，则直接返回
                         return true;
                     } else {
                         // 如果是待结算，则过滤掉对应的积分包状态
-                        return StrUtil.split(status.getScorePackageStatus(), StrUtil.COMMA).contains(pkg.getScorePackageStatus());
+                        return CharSequenceUtil.split(status.getScorePackageStatus(), StrPool.COMMA).contains(pkg.getScorePackageStatus());
                     }
                 })
                 .collect(Collectors.toMap(WmScorePackage::getId, WmScorePackage::getScorePackageName));
@@ -4055,7 +3866,7 @@ public class ApiController {
 
         for (SysUser user : userList) {
             Set<Object> signAgreementDTOList = new HashSet<>();
-            if (StrUtil.isBlank(user.getSignAgreement())) {
+            if (CharSequenceUtil.isBlank(user.getSignAgreement())) {
                 signAgreementDTOList.add(JSONUtil.parseObj(signAgreementDTO));
             } else {
                 JSONArray agreements = JSONUtil.parseArray(user.getSignAgreement());
@@ -4084,7 +3895,7 @@ public class ApiController {
         log.info("关闭年满60周岁提醒:userId={},idCardNumber={}", userId, queryUser.getIdCardNumber());
 
         boolean update = false;
-        if (StrUtil.isNotBlank(queryUser.getIdCardNumber())) {
+        if (CharSequenceUtil.isNotBlank(queryUser.getIdCardNumber())) {
             update = sysUserService.update(Wrappers.<SysUser>lambdaUpdate()
                     .eq(SysUser::getIdCardNumber, queryUser.getIdCardNumber())
                     .set(SysUser::getAgeReminder, Boolean.FALSE)