维修

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -11,10 +11,13 @@ import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
+import com.platform.dao.dto.sb.SbChangeRecordDTO;
+import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.upms.SysConfig;
 import com.platform.dao.enums.RepairApplicationFormTypeEnum;
 import com.platform.dao.enums.SysConfigEnum;
 import com.platform.dao.enums.SysRoleCodeEnum;
+import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.NoticeNumberVO;
 import com.platform.dao.vo.export.repair.ExportRepairApplicationFormVO;
@@ -24,6 +27,7 @@ import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.repair.RepairApplicationFormService;
 import com.platform.service.repair.strategy.RepairBaseStrategy;
 import com.platform.service.repair.strategy.RepairStrategyFactory;
+import com.platform.service.sb.SbChangeRecordService;
 import com.platform.service.upms.SysConfigService;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -31,6 +35,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -49,6 +54,10 @@ public class RepairApplicationFormController {
 
     private final SysConfigService sysConfigService;
 
+    private final SbChangeRecordService sbChangeRecordService;
+
+    private final RepairApplicationFormMapper repairApplicationFormMapper;
+
     /**
      * 通过id查询单条记录
      *
@@ -308,6 +317,11 @@ public class RepairApplicationFormController {
     @PutMapping("/close/repair")
     public R closeRepair(@RequestBody RepairApplicationFormDTO applicationFormDTO) {
         RepairStrategyFactory.getStrategy(applicationFormDTO.getCategory()).closeRepair(applicationFormDTO);
+        RepairApplicationForm form =  repairApplicationFormMapper.selectById(applicationFormDTO.getId());
+        SbChangeRecordDTO dto = new SbChangeRecordDTO();
+        dto.setTransformType(2);
+        dto.setSbId(form.getSbId());
+        sbChangeRecordService.saveModelByDTO(dto);
         return new R<>();
     }
 

platform-service/src/main/java/com/platform/service/fill/impl/FillGatherTaskServiceImpl.java

@@ -8,16 +8,19 @@ import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.cache.ConfigCache;
 import com.platform.common.constant.RedisKeyConstants;
 import com.platform.common.exception.DeniedException;
+import com.platform.common.model.OauthUser;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.fill.FillGatherTaskDTO;
 import com.platform.dao.dto.fill.FillGatherTaskDetailDTO;
 import com.platform.dao.entity.fill.*;
+import com.platform.dao.entity.sb.SbChangeRecord;
 import com.platform.dao.entity.upms.SysRole;
 import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.fill.*;
+import com.platform.dao.mapper.sb.SbChangeRecordMapper;
 import com.platform.dao.mapper.upms.SysRoleMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.util.MessageTemplateUtil;
@@ -35,6 +38,9 @@ import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
+import javax.persistence.Id;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -60,6 +66,7 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
     private final SysUserMapper sysUserMapper;
     private final FillUpdateRecordMapper fillUpdateRecordMapper;
     private final SysRoleMapper sysRoleMapper;
+    private final SbChangeRecordMapper sbChangeRecordMapper;
 
     private void deleteDetails(List<String> detailIds,String taskId){
         StringBuilder ids = new StringBuilder();
@@ -502,15 +509,49 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
         if(StringUtils.isBlank(model.getId())){
             throw new DeniedException("任务ID不能为空");
         }
+
         FillGatherTask task = new FillGatherTask();
         task.setId(model.getId());
         task.setRecordJson(model.getRecordJson());
         task.setUpdateTime(LocalDateTime.now());
         task.setStatus(model.getStatus());
         mapper.updateByPrimaryKeySelective(task);
+        List<SbChangeRecord> list = new ArrayList<>();
+        for (String id:model.getSbIds()) {
+            SbChangeRecord sbChangeRecord = new SbChangeRecord();
+            sbChangeRecord.setCreatedTime(LocalDateTime.now());
+            sbChangeRecord.setUpdateTime(LocalDateTime.now());
+            sbChangeRecord.setTransformType(SbTransFormTypeEnum.FILL_CHECK.getValue());
+            sbChangeRecord.setSbId(id);
+            OauthUser user = SecurityUtils.getUser();
+            if (user != null) {
+                UserInfo userInfo = user.getUserInfo();
+                sbChangeRecord.setCreatedUserId(userInfo.getUserId());
+                sbChangeRecord.setCreatedUserName(userInfo.getRealName());
+            }
+            setKey(sbChangeRecord);
+            list.add(sbChangeRecord);
+
+        }
+        sbChangeRecordMapper.insertListforComplex(list);
         // 通知巡检人
         //sendMessageToChecker(mapper.selectByPrimaryKey(task.getId()),null);
     }
+    public void setKey(SbChangeRecord t) {
+        Field[] fields = t.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            Annotation id = field.getAnnotation(Id.class);
+            if (id == null) {
+                continue;
+            }
+            try {
+                field.setAccessible(true);
+                field.set(t, IdGeneratorUtils.getObjectId());
+            } catch (IllegalAccessException e) {
+//                log.error("主键赋值异常");
+            }
+        }
+    }
 
     @Override
     public void fillStopDefault(String taskId, String detailId) {

platform-service/src/main/java/com/platform/service/sb/impl/SbMeasureLogServiceImpl.java

@@ -5,6 +5,8 @@ import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.constant.CommonConstants;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.exception.DeniedException;
+import com.platform.common.model.OauthUser;
+import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.sb.BatchSbMeasureLog;
@@ -17,10 +19,7 @@ import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.sb.SbLocation;
 import com.platform.dao.entity.sb.SbMeasureLog;
 import com.platform.dao.entity.upms.SysFile;
-import com.platform.dao.enums.SbInfoStatusEnum;
-import com.platform.dao.enums.SbUseType;
-import com.platform.dao.enums.SysFileTypeEnum;
-import com.platform.dao.enums.YesNoEnum;
+import com.platform.dao.enums.*;
 import com.platform.dao.mapper.sb.*;
 import com.platform.dao.vo.query.sb.SbMeasureLogVO;
 import com.platform.dao.vo.report.MeasureLogReportVO;
@@ -29,10 +28,14 @@ import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.sb.SbMeasureLogService;
 import com.platform.service.upms.SysFileService;
 import lombok.AllArgsConstructor;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.weekend.Weekend;
 
+import javax.persistence.Id;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
@@ -520,12 +523,40 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
 
     /**
      * *
-     * @param batchSbMeasureLog
+     * @param
      */
+    public void setKey(SbChangeRecord t) {
+        Field[] fields = t.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            Annotation id = field.getAnnotation(Id.class);
+            if (id == null) {
+                continue;
+            }
+            try {
+                field.setAccessible(true);
+                field.set(t, IdGeneratorUtils.getObjectId());
+            } catch (IllegalAccessException e) {
+//                log.error("主键赋值异常");
+            }
+        }
+    }
     @Override
     public void saveBatchMeasureLog(BatchSbMeasureLog batchSbMeasureLog) {
         if (batchSbMeasureLog.getSbMeasureLogDTOList() != null && batchSbMeasureLog.getSbMeasureLogDTOList().size() > 0) {
             batchSbMeasureLog.getSbMeasureLogDTOList().forEach(item -> {
+                SbChangeRecord sbChangeRecord = new SbChangeRecord();
+                sbChangeRecord.setCreatedTime(LocalDateTime.now());
+                sbChangeRecord.setUpdateTime(LocalDateTime.now());
+                sbChangeRecord.setTransformType(SbTransFormTypeEnum.CHECK.getValue());
+                sbChangeRecord.setSbId(item.getSbId());
+                OauthUser user = SecurityUtils.getUser();
+                if (user != null) {
+                    UserInfo userInfo = user.getUserInfo();
+                    sbChangeRecord.setCreatedUserId(userInfo.getUserId());
+                    sbChangeRecord.setCreatedUserName(userInfo.getRealName());
+                }
+                setKey(sbChangeRecord);
+                sbChangeRecordMapper.insertSelective(sbChangeRecord);
                 this.saveModelByDTO(item);
             });
         }