fix 学习记录

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ToolsUtils.java

@@ -260,5 +260,21 @@ public class ToolsUtils {
         return null;
     }
 
+    /**
+     * 不够位数的在前面补0，保留num的长度位数字
+     * @param code
+     * @return
+     */
+    public static String autoGenericCode(String code, int num) {
+        String result = "";
+        // 保留num的位数
+        // 0 代表前面补充0
+        // num 代表长度为4
+        // d 代表参数为正数型
+        result = String.format("%0" + num + "d", Integer.parseInt(code) + 1);
+
+        return result;
+    }
+
 
 }

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/http/HttpUtils.java

@@ -170,7 +170,6 @@ public class HttpUtils
 
     public static String sendPostJsonHeader(String url, String json, Map<String, String> headersMap)
     {
-        System.out.println(json);
         HttpClient client = HttpClients.createDefault();
         HttpPost post = new HttpPost(url);
         try {

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/wisdom/SignatureUtil.java

@@ -1,4 +1,5 @@
 package com.zhongzheng.common.utils.wisdom;
+
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 
 import javax.crypto.Mac;
@@ -113,39 +114,30 @@ public class SignatureUtil {
 //            }
 //
 //        }
-
         getParams(paramMap, buffer);
-
         String result = buffer.toString();
-
-        System.out.println("签名串：" + result);
-
         return result;
     }
 
     private static void getParams(Map<String, Object> paramMap, StringBuilder buffer) {
         List<String> keys = new ArrayList<String>(paramMap.keySet());
         Collections.sort(keys);
-
         for (String key : keys) {
-            if (paramMap.get(key) != null && notfiler(key)){
+            if (paramMap.get(key) != null && notfiler(key)) {
                 Object obj = paramMap.get(key);
-
                 if (obj instanceof List<?>) {
                     try {
                         List<Map<String, Object>> list = (List<Map<String, Object>>) obj;
-
                         for (Map<String, Object> map : list) {
-                            getParams(map , buffer);
+                            getParams(map, buffer);
                         }
-                    }catch (Exception e){
+                    } catch (Exception e) {
                         System.out.println("list 转map出错 ：" + e.getMessage());
                     }
-
-                }else if (obj instanceof Map<?,?>){
+                } else if (obj instanceof Map<?, ?>) {
                     Map<String, Object> map = (Map<String, Object>) obj;
-                    getParams(map , buffer);
-                }else if (obj instanceof String) {
+                    getParams(map, buffer);
+                } else if (obj instanceof String) {
                     String value = obj.toString();
                     if (StringUtils.isNotBlank(value)) {
                         try {
@@ -163,88 +155,21 @@ public class SignatureUtil {
 
     }
 
-    private static boolean notfiler(String key){
+    private static boolean notfiler(String key) {
         boolean flag = true;
         Map<String, Integer> map = new HashMap<>();
-
         map.put("examineeZipFiles", 0);
-
-        if (map.containsKey(key)){
+        if (map.containsKey(key)) {
             flag = false;
         }
-
         return flag;
     }
 
-    private static Map<String, Object> getMap(List<Map<String, Object>> paramMapList, String key){
+    private static Map<String, Object> getMap(List<Map<String, Object>> paramMapList, String key) {
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put(key, paramMapList);
 
         return paramMap;
     }
 
-    public static void main(String[] args) throws Exception {
-        //参数
-//        Map<String, Object> paramMap = new HashMap<>();
-//
-        String key = "ZZ-YXT-GZ-20220820-0001";
-//
-//        paramMap.put("appid", key);
-//        paramMap.put("appname", "中正云学堂");
-//        paramMap.put("tenantId", 10001);
-//
-//        //服务端返回的签名
-//        String signature = createSignature(paramMap, key);
-//
-//        System.out.println("sign:"+ signature);
-//
-//        boolean signatureValid = isSignatureValid(paramMap, key, signature);
-//
-//        System.out.println("valid:"+ signatureValid);
-//
-//        paramMap.put("l", "30");
-//
-//        boolean signatureValid1 = isSignatureValid(paramMap, key, signature);
-//
-//        System.out.println("valid1:"+ signatureValid1);
-
-//        String s = "/bbacc/yy/sss.zip";
-//
-//        int index1 = s.lastIndexOf("/");
-//        int index2 = s.lastIndexOf(".");
-//
-//        String res = s.substring(index1 + 1, index2);
-//
-//        System.out.println(res);
-
-        List<Map<String, Object>> map = new ArrayList<>();
-
-        Map<String, Object> param = new LinkedHashMap<>();
-
-        param.put("centerId", 245404160);
-        param.put("examCode", "DD6614110143");
-        param.put("zipFileName", "111考生证件照");
-
-        List<Map<String, Object>> map1 = new ArrayList<>();
-
-        Map<String, Object> param1 = new LinkedHashMap<>();
-
-        param1.put("examineeCode", "ZS123456");
-        param1.put("examineeName", "ddsfs");
-        param1.put("idCardImg1", "oss/images/avatar/53/1651809521815_1361907024");
-        param1.put("idCardImg2", "oss/images/avatar/53/1651807661764_861745654");
-        param1.put("idNumber", "fsdfdsfs");
-        param1.put("phone_num", "18565397890");
-        param1.put("reportStatus", "未签署");
-
-        map1.add(param1);
-
-        param.put("examinees",map1);
-
-        map.add(param);
-
-        String signature = createSignature(map, key);
-
-        System.out.println(signature);
-    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -302,8 +302,8 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         String key = "STUDY_Record_"+bo.getUserId();
         Long value = redisCache.getCacheObject(key);
         if(value!=null&&(Validator.isEmpty(bo.getStatus())||bo.getStatus()!=1)){
-            //非学完状态且不带图片则防重复提交处理
-            if(Validator.isEmpty(bo.getPhoto())){
+            //非学完状态且带图片则防重复提交处理
+            if(Validator.isNotEmpty(bo.getPhoto())){
                 return 1;
             }
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -17,6 +17,7 @@ import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.modules.alioss.service.OssService;
 import com.zhongzheng.modules.alisms.service.IAliSmsService;
 import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
@@ -259,7 +260,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         add.setExamStatus(0);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        add.setExamineeCode(ServletUtils.getEncoded("ZZ"+add.getApplyId()+""+add.getUserId()));
+        add.setExamineeCode(ServletUtils.getEncoded("ZZ"+ ToolsUtils.autoGenericCode(String.valueOf(add.getApplyId()),3) +ToolsUtils.autoGenericCode(String.valueOf(add.getUserId()),3)));
         this.save(add);
         //发送预约考试消息
         sendExamSucceed(bo);
@@ -308,7 +309,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         add.setExamStatus(0);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        add.setExamineeCode(ServletUtils.getEncoded("ZZ"+add.getApplyId()+""+add.getUserId()));
+        add.setExamineeCode(ServletUtils.getEncoded("ZZ"+ ToolsUtils.autoGenericCode(String.valueOf(add.getApplyId()),3) +ToolsUtils.autoGenericCode(String.valueOf(add.getUserId()),3)));
         this.save(add);
         //发送预约考试消息
         sendExamSucceed(bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/wisdom/service/IWisdomService.java

@@ -5,6 +5,7 @@ import com.zhongzheng.modules.polyv.domain.PolyvVideo;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
 
 import java.text.ParseException;
+import java.util.Map;
 
 
 public interface IWisdomService {
@@ -12,5 +13,5 @@ public interface IWisdomService {
 
     void SiteList(Integer pageNo);
 
-    void syncApplyUserInfo(Long applyId);
+    Map<String,Object> syncApplyUserInfo(Long applyId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wisdom/service/impl/WisdomServiceImpl.java

@@ -218,7 +218,8 @@ public class WisdomServiceImpl  implements IWisdomService {
     }
 
     @Override
-    public void syncApplyUserInfo(Long applyId) {
+    public Map<String,Object> syncApplyUserInfo(Long applyId) {
+        Map<String,Object> mapResult = new HashMap<>();
         List<UserSubscribeVo> list = iUserSubscribeService.selectApplyUserList(applyId);
         Map<String,CenterVo> cMap = new HashMap<>();
         List<CenterVo> cList = new ArrayList<>();
@@ -271,7 +272,6 @@ public class WisdomServiceImpl  implements IWisdomService {
             CenterVo vo = cMap.get(key);
             String filename = FileUtils.encodingZipFilename(vo.getZipFileName());
             String zipFile = FileUtils.getZipAbsoluteFile(filename);
-            System.out.println(zipFile);
             try {
                 ZipOutputStream outStream = new ZipOutputStream(new FileOutputStream(zipFile));
                 List<FileBean> fileBeanList = new ArrayList<>();
@@ -328,24 +328,37 @@ public class WisdomServiceImpl  implements IWisdomService {
             if (userInfoJSON.containsKey("code")&&"200".equals(String.valueOf(userInfoJSON.get("code")))) {
                 JSONArray jsonArray = userInfoJSON.getJSONObject("result").getJSONArray("records");
                 List<ExamineesVo> listRs=jsonArray.toJavaList(ExamineesVo.class);
+                int total = 0;
+                int success = 0;
+                int fail = 0;
+                total = listRs.size();
                 for (ExamineesVo vo : listRs){
                     LambdaUpdateWrapper<UserSubscribe> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
                     objectLambdaUpdateWrapper.eq(UserSubscribe::getExamineeCode, vo.getExamineeCode());
-
-                    objectLambdaUpdateWrapper.set(UserSubscribe::getSeatNumber, vo.getSeatNumber());
-                    objectLambdaUpdateWrapper.set(UserSubscribe::getSyncStatus, 1);
-                    objectLambdaUpdateWrapper.set(UserSubscribe::getRoomAddress, vo.getRoomAddress());
-                    objectLambdaUpdateWrapper.set(UserSubscribe::getSyncResult, "同步成功"+DateUtils.getTime());
-                    objectLambdaUpdateWrapper.set(UserSubscribe::getRoomName, vo.getRoomName());
-                    objectLambdaUpdateWrapper.set(UserSubscribe::getRoomCode, vo.getRoomCode());
-                    objectLambdaUpdateWrapper.set(UserSubscribe::getRoomId, vo.getRoomId());
+                    if(vo.getDistributionStatus()==0){
+                        objectLambdaUpdateWrapper.set(UserSubscribe::getSeatNumber, vo.getSeatNumber());
+                        objectLambdaUpdateWrapper.set(UserSubscribe::getSyncStatus, 1);
+                        objectLambdaUpdateWrapper.set(UserSubscribe::getRoomAddress, vo.getRoomAddress());
+                        objectLambdaUpdateWrapper.set(UserSubscribe::getSyncResult, "同步成功"+DateUtils.getTime());
+                        objectLambdaUpdateWrapper.set(UserSubscribe::getRoomName, vo.getRoomName());
+                        objectLambdaUpdateWrapper.set(UserSubscribe::getRoomCode, vo.getRoomCode());
+                        objectLambdaUpdateWrapper.set(UserSubscribe::getRoomId, vo.getRoomId());
+                        success++;
+                    }else{
+                        objectLambdaUpdateWrapper.set(UserSubscribe::getSyncStatus, 2);
+                        objectLambdaUpdateWrapper.set(UserSubscribe::getSyncResult, "同步失败:"+vo.getFailureReason()+DateUtils.getTime());
+                        fail++;
+                    }
                     objectLambdaUpdateWrapper.set(UserSubscribe::getUpdateTime,DateUtils.getNowTime());
                     iUserSubscribeService.update(null, objectLambdaUpdateWrapper);
                 }
+                mapResult.put("total",total);
+                mapResult.put("success",success);
+                mapResult.put("fail",fail);
             }
         }catch (Exception e){
-
+            throw new CustomException("同步错误");
         }
-
+        return mapResult;
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wisdom/vo/ExamineesVo.java

@@ -32,5 +32,7 @@ public class ExamineesVo {
 
     private String roomAddress;
 
+    private Integer distributionStatus;
 
+    private String failureReason;
 }