submit

run-prod.sh

@@ -1,42 +1,3 @@
-#!/usr/bin/env bash
-# 定义应用组名
-group_name='zhongzheng'
-# 定义应用名称
-app_name='zhongzheng-saas-api'
-# 定义应用版本
-app_version='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar----'
-docker stop ${app_name}
-echo '----stop container----'
-docker rm ${app_name}
-echo '----rm container----'
-docker rmi ${group_name}/${app_name}:${app_version}
-echo '----rm image----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile -t ${group_name}/${app_name}:${app_version} .
-echo '----build image----'
-docker run -p 5055:5055 --name ${app_name} \
---restart=always \
--e 'spring.profiles.active'=${profile_active} \
--e TZ="Asia/Shanghai" \
--m 10240m \
---cpus=3 \
---log-opt max-size=50m \
---log-opt max-file=3 \
--v /etc/localtime:/etc/localtime \
--v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/prod_api:/logs \
--v /mydata/app/${app_name}/logs:/var/logs \
--d ${group_name}/${app_name}:${app_version}
-echo '----start container----'
-
-echo "开始等待20秒..."
-# 1-10秒内随机
-sleep 5
-echo "等待后继续"
-
 #!/usr/bin/env bash
 # 定义应用组名
 group_admin_name='zhongzheng'

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -1561,32 +1561,35 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 && Validator.isNotEmpty(gradeVo.getOfficialName()) && Validator.isEmpty(gradeVo.getSevenCode())) {
             ClassGradeQueryBo queryBo = new ClassGradeQueryBo();
             queryBo.setOfficialName(gradeVo.getOfficialName());
-            Integer peopleNum = queryOfficialGradeCount(queryBo);
+            numAll = queryOfficialGradeCount(queryBo);
+
+            //暂时关闭旧系统查询班级通道
             //查询旧系统
-            Map<String, String> params = new HashMap<>();
-            Long nowTime = DateUtils.getNowTime();
-            String sign = ToolsUtils.EncoderByMd5(nowTime.toString() + "pubilc2022");
-            params.put("stamp", nowTime.toString());
-            params.put("sign", sign);
-            params.put("jsonstr", gradeVo.getOfficialName());
-            String respone = "";
-            log.info("查询业务系统班级人数" + params, "");
-            Integer oldGradeNum = 0;
-            try {
-                respone = HttpUtils.postFormBody(GRADE_COUNT_PATH, params);
-                log.info("查询业务系统班级人数结果" + respone, "");
-                if (!respone.contains("\"Status\":true")) {
-                    throw new CustomException("同步请求错误" + respone);
-                }
-                JSONObject jsonObject = (JSONObject) JSONObject.parse(respone);
-                JSONArray dataArray = jsonObject.getJSONArray("Data");
-                JSONObject fObject = dataArray.getJSONObject(0);
-                oldGradeNum = (Integer) fObject.get("num");
-            } catch (IOException e) {
-                log.info("查询业务系统班级人数失败参数" + params, "");
-                throw new CustomException("同步查询班级人数请求错误" + e.getMessage());
-            }
-            numAll = peopleNum + oldGradeNum;
+//            Integer peopleNum = queryOfficialGradeCount(queryBo);
+//            Map<String, String> params = new HashMap<>();
+//            Long nowTime = DateUtils.getNowTime();
+//            String sign = ToolsUtils.EncoderByMd5(nowTime.toString() + "pubilc2022");
+//            params.put("stamp", nowTime.toString());
+//            params.put("sign", sign);
+//            params.put("jsonstr", gradeVo.getOfficialName());
+//            String respone = "";
+//            log.info("查询业务系统班级人数" + params, "");
+//            Integer oldGradeNum = 0;
+//            try {
+//                respone = HttpUtils.postFormBody(GRADE_COUNT_PATH, params);
+//                log.info("查询业务系统班级人数结果" + respone, "");
+//                if (!respone.contains("\"Status\":true")) {
+//                    throw new CustomException("同步请求错误" + respone);
+//                }
+//                JSONObject jsonObject = (JSONObject) JSONObject.parse(respone);
+//                JSONArray dataArray = jsonObject.getJSONArray("Data");
+//                JSONObject fObject = dataArray.getJSONObject(0);
+//                oldGradeNum = (Integer) fObject.get("num");
+//            } catch (IOException e) {
+//                log.info("查询业务系统班级人数失败参数" + params, "");
+//                throw new CustomException("同步查询班级人数请求错误" + e.getMessage());
+//            }
+//            numAll = peopleNum + oldGradeNum;
         } else if (Validator.isNotEmpty(gradeVo) && Validator.isNotEmpty(gradeVo.getSevenCode())) {
             //七大员继教
             Long num = baseMapper.getStudeCountByCode(gradeVo.getSevenCode());