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

platform-common/src/main/java/com/platform/common/constant/CommonConstants.java

@@ -299,4 +299,5 @@ public interface CommonConstants {
     String CHANGE_TYPE_SB_PARENT = "3"; // 父设备变动
     String CHANGE_TYPE_SB_STATUS = "4"; // 设备状态变动
     String CHANGE_TYPE_SB_ZZH = "5"; // 设备原号变动
+    String CHANGE_TYPE_SB_PPNO = "6"; // 设备父位号变动
 }

platform-dao/src/main/java/com/platform/dao/dto/fill/FillGatherTaskDTO.java

@@ -150,4 +150,9 @@ public class FillGatherTaskDTO extends BaseDTO implements Serializable {
 
     private String remark;
 
+    /**
+     * 任务等级 A级  B级 C级
+     */
+    private String taskLevel;
+
 }

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -422,4 +422,8 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
      * 机电仪位号
      */
     private String parentSbNo;
+
+    private Integer repairProfessor; // 维修专业
+
+    private Integer repairType; // 维修类型
 }

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairTicketTemplateData.java

@@ -40,4 +40,8 @@ public class RepairTicketTemplateData implements Serializable {
     private String sbPositionName; // 设备所属车间
 
     private Double requireHours; // 要求时间
+
+    private Integer repairProfessor; // 维修专业
+
+    private Integer repairType; // 维修类型
 }

platform-dao/src/main/java/com/platform/dao/dto/sb/BatchSbMeasureLog.java

@@ -9,4 +9,9 @@ import java.util.List;
 public class BatchSbMeasureLog implements Serializable {
 
     private List<SbMeasureLogDTO> sbMeasureLogDTOList;
+
+    /**
+     * 在库ID集合
+     */
+    private List<String> sbIds;
 }

platform-dao/src/main/java/com/platform/dao/dto/sb/SbMeasureLogDTO.java

@@ -231,4 +231,9 @@ public class SbMeasureLogDTO extends BaseDTO implements Serializable {
      * 设备原号
      */
     private String zzh;
+
+    /**
+     * 父位号
+     */
+    private String sbPpno;
 }

platform-dao/src/main/java/com/platform/dao/entity/fill/FillGatherTask.java

@@ -109,6 +109,11 @@ public class FillGatherTask implements Serializable {
      */
     private Integer period;
 
+    /**
+     * 任务等级 A级  B级 C级
+     */
+    private String taskLevel;
+
     /**
      * 数据权限
      */

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -308,4 +308,8 @@ public class RepairApplicationForm implements Serializable {
      */
     private String parentSbNo;
 
+    private Integer repairProfessor; // 检维修单位
+
+    private Integer repairType; // 工作类型
+
 }

platform-dao/src/main/java/com/platform/dao/mapper/sb/SbInfoMapper.java

@@ -151,8 +151,14 @@ public interface SbInfoMapper extends MyMapper<SbInfo> {
     /**
      * 分页查询类型汇总
      *
-     * @param useType 自定义类型
+     * @param dto 自定义类型
      * @return
      */
     List<Map<String, String>> selectCountMap(SbInfoDTO dto);
+
+    /**
+     * 修改待入库设备
+     * @param sbInfoDTO
+     */
+    void updateLongYanForInStore(SbInfoDTO sbInfoDTO);
 }

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbInfoVO.java

@@ -202,5 +202,9 @@ public class ExportSbInfoVO implements Serializable {
     private String fbbz;
     @Excel(name="防爆合格证号",styleType=1)
     private String fbhgzh;
+    @Excel(name="轴承型号",styleType=1)
+    private String zcxh;
+    @Excel(name="风叶型号",styleType=1)
+    private String fyxh;
 
 }

platform-dao/src/main/java/com/platform/dao/vo/query/fill/FillGatherTaskVO.java

@@ -111,5 +111,9 @@ public class FillGatherTaskVO extends BaseVO implements Serializable {
     private String checkerName; // 巡检人名称
     private String leaderName; // 巡检主管名称
 
+    /**
+     * 任务等级 A级  B级 C级
+     */
+    private String taskLevel;
 
 }

platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java

@@ -402,4 +402,8 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
     private String selfParentNo; // 父位号
 
     private String sbPositionName; // 车间名称
+
+    private Integer repairProfessor; // 维修专业
+
+    private Integer repairType; // 维修类型
 }

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -851,4 +851,7 @@ sb.scrap_user_name,sb.repair_dept_id
         GROUP BY type_id
     </select>
 
+    <update id="updateLongYanForInStore" parameterType="com.platform.dao.dto.sb.SbInfoDTO">
+        update t_sb_info set status = #{status},position_id = null,positionNo = null,ppNo = null,parentId = null where id = #{id}
+    </update>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/sb/SbInfoController.java

@@ -425,7 +425,7 @@ public class SbInfoController {
     public R importExcelByUpdate(@RequestParam("type") Integer type, @RequestParam("file") MultipartFile file) throws Exception {
         String result = "";
         if(type == 1){
-            result = sbInfoService.importListByAdd( file);
+            result = sbInfoService.importListByAdd(file);
         }else if(type == 2){
             result = sbInfoService.importListByUpdateALl(file);
         }else if(type == 3){// 废弃

platform-rest/src/main/java/com/platform/rest/controller/sb/SbMeasureLogController.java

@@ -71,6 +71,13 @@ public class SbMeasureLogController {
     return new R<>();
   }
 
+  @SysLog("批量设备在库")
+  @PostMapping("/longYan/in/batch")
+  public R inLongYanBatch(@RequestBody BatchSbMeasureLog batchSbMeasureLog) {
+    sbMeasureLogService.saveBatchIn(batchSbMeasureLog);
+    return new R<>();
+  }
+
   /**
    * 修改记录
    *
@@ -149,4 +156,10 @@ public class SbMeasureLogController {
     ExcelUtil.exportResponseDict(response, ExportSbMeasureLogVO.class, BeanConverterUtil.copyListProperties(list, ExportSbMeasureLogVO.class), "计量设备检定记录");
   }
 
+  @GetMapping("/generate/init")
+  public R generateInit() {
+    sbMeasureLogService.generateInitLog();
+    return new R<>();
+  }
+
 }

platform-rest/src/main/resources/application-dev.yml

@@ -76,6 +76,7 @@ ignore:
     - /ignores/**
     - /wechat/**
     - /yongyou/**
+    - /sb/measure-logs/generate/init
 
 
 platform:

platform-rest/src/main/resources/application-test.yml

@@ -54,6 +54,7 @@ ignore:
     - /ignores/**
     - /wechat/**
     - /yongyou/**
+    - /sb/measure-logs/generate/init
 
 platform:
   slf4j:

platform-service/src/main/java/com/platform/service/customize/impl/CustomFieldTemplateDataServiceImpl.java

@@ -266,6 +266,8 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
             if(StringUtils.isNotBlank(repairApplicationForm.getDispatchUserId())){
                 data.setDispatcher(sysUserMapper.selectByPrimaryKey(repairApplicationForm.getDispatchUserId()).getRealName());
             }
+            data.setRepairProfessor(repairApplicationForm.getRepairProfessor());
+            data.setRepairType(repairApplicationForm.getRepairType());
             data.setRequireHours(repairApplicationForm.getLimitHours());
             data.setRepairMan(sysUserMapper.selectByPrimaryKey(repairApplicationForm.getRepairUserId()).getRealName());
             data.setRepairNo(repairApplicationForm.getNo());

platform-service/src/main/java/com/platform/service/sb/SbMeasureLogService.java

@@ -1,12 +1,8 @@
 package com.platform.service.sb;
 
-import com.platform.dao.dto.check.CheckJobDTO;
-import com.platform.dao.dto.check.CheckStandardDTO;
 import com.platform.dao.dto.sb.BatchSbMeasureLog;
 import com.platform.dao.dto.sb.SbMeasureLogDTO;
-import com.platform.dao.entity.check.CheckStandard;
 import com.platform.dao.entity.sb.SbMeasureLog;
-import com.platform.dao.vo.query.check.CheckStandardVO;
 import com.platform.dao.vo.query.sb.SbMeasureLogVO;
 import com.platform.dao.vo.report.MeasureLogReportVO;
 import com.platform.service.base.IBaseService;
@@ -57,4 +53,11 @@ public interface SbMeasureLogService extends IBaseService<SbMeasureLog, SbMeasur
      * @param model
      */
     //void saveTZSBByDTTO(SbMeasureLogDTO model);
+
+    /**
+     * 批量在库
+     */
+    void saveBatchIn(BatchSbMeasureLog batchSbMeasureLog);
+
+    void generateInitLog();
 }

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

@@ -9,6 +9,7 @@ import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.sb.BatchSbMeasureLog;
 import com.platform.dao.dto.sb.SbChangeRecordDTO;
+import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.sb.SbMeasureLogDTO;
 import com.platform.dao.entity.check.CheckProjectStandardRelation;
 import com.platform.dao.entity.sb.SbChangeRecord;
@@ -23,6 +24,7 @@ import com.platform.dao.enums.YesNoEnum;
 import com.platform.dao.mapper.sb.*;
 import com.platform.dao.vo.query.sb.SbMeasureLogVO;
 import com.platform.dao.vo.report.MeasureLogReportVO;
+import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.sb.SbMeasureLogService;
 import com.platform.service.upms.SysFileService;
@@ -143,7 +145,6 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         SbInfo tempInfo = new SbInfo();
         tempInfo.setId(sbInfo.getId());
         // 判断设备状态，如果是在库，修改设备状态即可
-
         model.setCheckUserId(SecurityUtils.getUserInfo().getUserId()); // 谁操作即是检定记录人
         if (SbUseType.BGCL.getValue().equals(sbInfo.getUseType())) {
             model.setType(1);
@@ -316,6 +317,19 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
                 record.setOldParentId(sb.getParentId());
                 record.setParentId(model.getSbParentId());
                 break;
+            case CommonConstants.CHANGE_TYPE_SB_PPNO:
+                record.setSbNoId(model.getSbPpno());
+                record.setStartTime(LocalDateTime.now());
+                // 将之前位置编号的结束时间修正
+                SbChangeRecordDTO dto2 = new SbChangeRecordDTO();
+                dto2.setChangeType(record.getChangeType());
+                dto2.setSbNoId(model.getSbPositionNo());
+                SbChangeRecord oldRecord2 = sbChangeRecordMapper.getLastOne(dto2);
+                if (oldRecord2 != null) {
+                    oldRecord2.setEndTime(LocalDateTime.now());
+                    sbChangeRecordMapper.updateByPrimaryKey(oldRecord2);
+                }
+                break;
             case CommonConstants.CHANGE_TYPE_SB_STATUS:
             case CommonConstants.CHANGE_TYPE_SB_ZZH:
                 break;
@@ -468,6 +482,62 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         }
     }
 
+    @Override
+    public void saveBatchIn(BatchSbMeasureLog batchSbMeasureLog) {
+        if (batchSbMeasureLog.getSbIds() != null && batchSbMeasureLog.getSbIds().size() > 0) {
+            batchSbMeasureLog.getSbIds().forEach(item -> {
+                this.saveModelForIn(item);
+            });
+        }
+    }
+
+    @Override
+    public void generateInitLog() {
+        SbInfoDTO sbInfoDTO = new SbInfoDTO();
+        sbInfoDTO.setUseType(4);
+        sbInfoDTO.setIsMeasure(1);
+        List<SbInfoVO> list = sbInfoMapper.selectVOList(sbInfoDTO);
+        List<SbMeasureLog> logList = ListUtils.newArrayList();
+        list.forEach(item -> {
+            SbMeasureLog log = new SbMeasureLog();
+            log.setName("huangrh");
+            log.setLastDate(item.getCheckDate());
+            log.setType(1);
+            log.setCheckUserId("62d61960030de40d4cdd579f");
+            log.setRequirement("龙岩质检");
+            log.setCreatedUserId("62d61960030de40d4cdd579f");
+            log.setCreatedTime(LocalDateTime.now());
+            log.setCreatedUserName("黄汝煌");
+            log.setUpdateTime(LocalDateTime.now());
+            log.setSbId(item.getId());
+            log.setId(IdGeneratorUtils.getObjectId());
+            logList.add(log);
+        });
+        mapper.insertList(logList);
+    }
+
+    /**
+     * 入库
+     * @param sbId
+     */
+    private void saveModelForIn(String sbId){
+        SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(sbId);
+        String oldPositionId = getPureString(sbInfo.getPositionId());
+        // 修改设备状态,【位号、父位号、设备位置清空】
+
+        SbMeasureLogDTO dto = new SbMeasureLogDTO();
+        // 记录位号
+        String remark1 = "设备位号变动【" + sbInfo.getPositionNo() + "】 ---> 【无】";
+        handleSbChangeRecord(remark1,dto,sbInfo,CommonConstants.CHANGE_TYPE_SB_NO);
+        // 记录父位号
+        String remark2 = "设备父位号变动【" + sbInfo.getPpNo() + "】 ---> 【无】";
+        handleSbChangeRecord(remark2,dto,sbInfo,CommonConstants.CHANGE_TYPE_SB_PPNO);
+        // 记录设备位置
+        String before = oldPositionId == "" ? oldPositionId : sbPositionMapper.selectNameById(oldPositionId);
+        String remark3 = "设备位置变动【" + before + "】 ---> 【无】";
+        handleSbChangeRecord(remark3,dto,sbInfo,CommonConstants.CHANGE_TYPE_SB_POSITION);
+    }
+
     /*@Override
     public void saveTZSBByDTTO(SbMeasureLogDTO model) {
         // 更新设备下次检定日期