Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskClassServiceImpl.java

@@ -491,6 +491,7 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
             one.setClassroomId(baseClass.getClassroomId());
             one.setDeleteMark(DeleteMark.NODELETE.getCode());
             one.setCreateDate(new Date());
+            one.setBaseClassId(baseClass.getId());
             one.setEnabledMark(EnabledMark.ENABLED.getCode());
             one.setName(baseClass.getName());
             one.setCreateUserId(StpUtil.getLoginIdAsLong());

src/main/java/com/xjrsoft/module/base/service/impl/BaseClassMergeServiceImpl.java

@@ -1,28 +1,39 @@
 package com.xjrsoft.module.base.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.enums.ArchivesStatusEnum;
 import com.xjrsoft.common.enums.DeleteMark;
+import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.enums.StudentChangeTypeEnum;
 import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.dto.BaseClassMergeStudentPageDto;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.entity.BaseClassMerge;
 import com.xjrsoft.module.base.entity.BaseClassMergeStudent;
+import com.xjrsoft.module.base.entity.BaseSystemConfig;
 import com.xjrsoft.module.base.mapper.BaseClassMapper;
 import com.xjrsoft.module.base.mapper.BaseClassMergeMapper;
 import com.xjrsoft.module.base.mapper.BaseClassMergeStudentMapper;
 import com.xjrsoft.module.base.service.IBaseClassMergeService;
+import com.xjrsoft.module.base.service.IBaseSystemConfigService;
 import com.xjrsoft.module.base.vo.BaseClassMergeStudentVo;
 import com.xjrsoft.module.organization.entity.User;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
+import com.xjrsoft.module.student.entity.StudentChangeClass;
 import com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper;
+import com.xjrsoft.module.student.mapper.StudentChangeClassMapper;
 import com.xjrsoft.module.student.service.IStudentChangeRecordService;
+import com.xjrsoft.module.workflow.entity.WorkflowFormRelation;
 import lombok.AllArgsConstructor;
+import org.camunda.bpm.engine.history.HistoricProcessInstance;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -47,6 +58,8 @@ public class BaseClassMergeServiceImpl extends MPJBaseServiceImpl<BaseClassMerge
     private final BaseClassMapper baseClassMapper;
     private final BaseStudentSchoolRollMapper schoolRollMapper;
     private final IStudentChangeRecordService changeRecordService;
+    private final IBaseSystemConfigService systemConfigService;
+    private final StudentChangeClassMapper studentChangeClassMapper;
 
 
     @Override
@@ -56,6 +69,45 @@ public class BaseClassMergeServiceImpl extends MPJBaseServiceImpl<BaseClassMerge
         if(collect.contains(baseClassMerge.getTargetClassId())){
             throw new MyException("原有班级中不能包含目标班级，请重新选择原有班级");
         }
+
+        BaseSystemConfig classNumberMax = systemConfigService.getOne(
+                new QueryWrapper<BaseSystemConfig>().lambda()
+                        .eq(BaseSystemConfig::getCode, "classNumberMax")
+        );
+        if(classNumberMax != null){
+            int classNumberMaxNum = Integer.parseInt(classNumberMax.getValue());
+            Integer actualStudentCount = schoolRollMapper.selectJoinCount(
+                    new MPJLambdaWrapper<BaseStudentSchoolRoll>()
+                            .distinct()
+                            .select(BaseStudentSchoolRoll::getUserId)
+                            .innerJoin(User.class, User::getId, BaseStudentSchoolRoll::getUserId)
+                            .eq(BaseStudentSchoolRoll::getDeleteMark, DeleteMark.NODELETE.getCode())
+                            .eq(BaseStudentSchoolRoll::getEnabledMark, EnabledMark.ENABLED.getCode())
+                            .eq(BaseStudentSchoolRoll::getArchivesStatus, ArchivesStatusEnum.FB2901.getCode())
+                            .eq(BaseStudentSchoolRoll::getClassId, baseClassMerge.getTargetClassId())
+            );
+
+            Integer count = studentChangeClassMapper.selectJoinCount(
+                    new MPJLambdaWrapper<StudentChangeClass>()
+                            .distinct()
+                            .select(StudentChangeClass::getStudentUserId)
+                            .innerJoin(WorkflowFormRelation.class, WorkflowFormRelation::getFormKeyValue, StudentChangeClass::getId)
+                            .eq(WorkflowFormRelation::getCurrentState, HistoricProcessInstance.STATE_ACTIVE)
+            );
+
+            String sql = "SELECT DISTINCT student_user_id FROM temporary_change_class t1" +
+                    " INNER JOIN xjr_workflow_form_relation t2 ON t1.id = CAST(t2.form_key_value AS SIGNED)" +
+                    " WHERE t1.delete_mark = 0 AND t2.current_state = 'ACTIVE'";
+            List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
+
+            int classCount = actualStudentCount + count + list.size();
+            int difference  = classCount - classNumberMaxNum;
+            int absoluteValue = (difference < 0) ? -difference : difference;
+            if(baseClassMerge.getBaseClassMergeStudentList().size() > absoluteValue){
+                throw new MyException("转入班级的人数大于班级剩余空位，该班级剩余" + absoluteValue + "人");
+            }
+        }
+
         baseClassMerge.setStudentCount(baseClassMerge.getBaseClassMergeStudentList().size());
         this.baseMapper.insert(baseClassMerge);
         BaseClass baseClass = baseClassMapper.selectById(baseClassMerge.getTargetClassId());

src/main/java/com/xjrsoft/module/hikvision/controller/OutInController.java

@@ -5,6 +5,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.gson.*;
 import com.xjrsoft.common.annotation.XjrLog;
+import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.module.hikvision.dto.HikvisionCarOutinPageDto;
@@ -62,7 +63,11 @@ public class OutInController {
 
         String doPost = apiUtil.doPost(apiPath, paramJson.toString(), null);
         JsonParser parser = new JsonParser();
-        JsonObject data = parser.parse(doPost).getAsJsonObject().get("data").getAsJsonObject();
+        JsonObject resultJson = parser.parse(doPost).getAsJsonObject();
+        if(!"0".equals(resultJson.get("code").getAsString())){
+            throw new MyException(resultJson.get("msg").getAsString());
+        }
+        JsonObject data = resultJson.get("data").getAsJsonObject();
         JsonArray list = data.get("list").getAsJsonArray();
         List<HikvisionOutinPageVo> result = new ArrayList<>();
         Gson gson = new Gson();
@@ -118,7 +123,11 @@ public class OutInController {
 
         String doPost = apiUtil.doPost(apiPath, paramJson.toString(), null);
         JsonParser parser = new JsonParser();
-        JsonObject data = parser.parse(doPost).getAsJsonObject().get("data").getAsJsonObject();
+        JsonObject resultJson = parser.parse(doPost).getAsJsonObject();
+        if(!"0".equals(resultJson.get("code").getAsString())){
+            throw new MyException(resultJson.get("msg").getAsString());
+        }
+        JsonObject data = resultJson.get("data").getAsJsonObject();
         JsonArray list = data.get("list").getAsJsonArray();
         List<HikvisionCarOutinPageVo> result = new ArrayList<>();
         Gson gson = new Gson();

src/main/java/com/xjrsoft/module/oa/utils/SendMessageUtil.java

@@ -101,9 +101,16 @@ public class SendMessageUtil {
                     put("value", param.getSchemaName());
                 }});
                 // 事项名称
-                data.put("thing2", new JSONObject() {{
-                    put("value", name);
-                }});
+                if(StrUtil.isNotEmpty(name) && name.length() > 16){
+                    data.put("thing2", new JSONObject() {{
+                        put("value", name.substring(0, 15));
+                    }});
+                }else{
+                    data.put("thing2", new JSONObject() {{
+                        put("value", name.substring(0, 15));
+                    }});
+                }
+
                 // 申请人
                 data.put("thing6", new JSONObject() {{
                     put("value", param.getStartUserName());

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -2891,7 +2891,6 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         NoticePolicyParam param = new NoticePolicyParam();
         param.setNoticeUserIds(Convert.toList(Long.class, approveIds));
         param.setTaskId(task.getId());
-        param.setTaskName(task.getName());
         param.setProcessId(task.getProcessInstanceId());
         param.setTaskName(task.getName());
         param.setSchemaId(MapUtil.get(variables, WorkflowConstant.PROCESS_SCHEMA_ID_KEY, Long.class));

src/test/java/com/xjrsoft/module/hikvision/controller/OutInControllerTest.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.hikvision.controller;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author dzx
+ * @date 2025/6/6
+ */
+class OutInControllerTest {
+
+    @Test
+    void test(){
+        String result = "{\"code\":\"0x02e13f03\",\"msg\":\"pms.base.license.notExist\",\"data\":null}";
+        JsonParser parser = new JsonParser();
+        JsonObject data = parser.parse(result).getAsJsonObject().get("data").getAsJsonObject();
+        System.out.println();
+
+    }
+
+}