fix 模板消息

zhongzheng-admin/src/main/resources/application-pre.yml

@@ -122,7 +122,7 @@ wisdomExamRoom:
     mchid: 10001
     appid: ZZ-YXT-GZ-20220820-0001
     app_secret: mt70O1s/Xd5LwuH7yHLpj9R+tKUn5j9vTnCvmgBnbJDA11Hpl7+q4lEZliqPAjN+YHPn9bGmHkAbw5XwhhMiYg==
-    host: JhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsic2hhbmp1LXJlc291cmNlIl0sI
+    host: http://bg.sam457.site:9020
 
 certificate:
     host: http://192.168.1.38:8000/

zhongzheng-api/src/main/resources/application-prod.yml

@@ -129,8 +129,8 @@ wisdomExamRoom:
     mchid: 10001
     appid: ZZ-YXT-GZ-20220820-0001
     app_secret: mt70O1s/Xd5LwuH7yHLpj9R+tKUn5j9vTnCvmgBnbJDA11Hpl7+q4lEZliqPAjN+YHPn9bGmHkAbw5XwhhMiYg==
-    host: JhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsic2hhbmp1LXJlc291cmNlIl0sI
-    
+    host: http://bg.sam457.site:9020
+
 certificate:
     host: https://m.xyyxt.net/
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamSiteServiceImpl.java

@@ -95,12 +95,12 @@ public class ExamSiteServiceImpl extends ServiceImpl<ExamSiteMapper, ExamSite> i
     @Override
     public Boolean insertByWisdomAddBo(WisdomRoomVo bo) {
         ExamSite add = new ExamSite();
-        add.setCenterId(bo.getCenterId());
+        add.setCenterId(bo.getId());
         add.setSiteAddress(bo.getCenterName());
         add.setPeople(bo.getSeatNum());
         add.setFromPlat(2);
         add.setStatus(1);
-        if(count(new QueryWrapper<ExamSite>().lambda().eq(ExamSite::getFromPlat,2).eq(ExamSite::getCenterId,bo.getCenterId()))>0){
+        if(count(new QueryWrapper<ExamSite>().lambda().eq(ExamSite::getFromPlat,2).eq(ExamSite::getCenterId,bo.getId()))>0){
             return false;
         }
         validEntityBeforeSave(add);

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

@@ -250,6 +250,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         add.setExamStatus(0);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setExamineeCode(ServletUtils.getEncoded("ZS"+add.getUserId()));
         this.save(add);
         //发送预约考试消息
         sendExamSucceed(bo);
@@ -298,6 +299,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         add.setExamStatus(0);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setExamineeCode(ServletUtils.getEncoded("ZS"+add.getUserId()));
         this.save(add);
         //发送预约考试消息
         sendExamSucceed(bo);

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

@@ -129,7 +129,7 @@ public class WisdomServiceImpl  implements IWisdomService {
 
     private String authorizationUrl = "/exam/api/authorization";
 
-    private String getRoomListUrl = "/exam/api/rooms";
+    private String getCentersListUrl = "/exam/api/centers";
 
     @Autowired
     private RedisCache redisCache;
@@ -171,7 +171,7 @@ public class WisdomServiceImpl  implements IWisdomService {
         paramMap.put("pageNo",pageNo);
         paramMap.put("pageSize",20);
         try{
-            String url = host + getRoomListUrl;
+            String url = host + getCentersListUrl;
             String signature = SignatureUtil.createSignature(paramMap, appid);
             JSONObject obj = new JSONObject();
             obj.put("pageNo",pageNo);

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

@@ -6,7 +6,7 @@ import lombok.Data;
 public class WisdomRoomVo {
     private static final long serialVersionUID = 1L;
 
-    private Long centerId;
+    private Long Id;
 
     private String centerName;
 

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyLogMapper.xml

@@ -54,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fromPlat != null and fromPlat !=''">
                 and usl.from_plat = #{fromPlat}
             </if>
+        ORDER BY
+        usl.id desc
     </select>
 
 </mapper>