维修

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

@@ -21,6 +21,7 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbChangeRecordDTO extends BaseDTO implements Serializable {
+    private Integer actionType;
     private Integer transformType;
 
     /**

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

@@ -26,6 +26,11 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class SbMeasureLogDTO extends BaseDTO implements Serializable {
 
+    /**
+     * 1：检定，2：更换，3：维修，4：退库，5：报废
+     */
+    private Integer otherType;
+
     /**
      * 主键
      */

platform-dao/src/main/java/com/platform/dao/entity/sb/SbChangeRecord.java

@@ -21,6 +21,7 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_sb_change_record")
 public class SbChangeRecord implements Serializable{
+    private Integer actionType;
     /**
      * 改变类型
      */

platform-dao/src/main/java/com/platform/dao/entity/sb/SbMeasureLog.java

@@ -23,6 +23,10 @@ import java.util.List;
 @Table(name = "t_sb_measure_log")
 @Data
 public class SbMeasureLog implements Serializable {
+    /**
+     * 1：检定，2：更换，3：维修，4：退库，5：报废
+     */
+    private Integer otherType;
 
     /**
      * 主键

platform-dao/src/main/java/com/platform/dao/enums/SbMeasureLogOtherTypeEnum.java

@@ -0,0 +1,45 @@
+package com.platform.dao.enums;
+
+import com.google.common.collect.Lists;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 设备状态
+ * @Author liuyu
+ * @Date 2020/05/05
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
+ */
+@Getter
+@AllArgsConstructor
+public enum SbMeasureLogOtherTypeEnum {
+
+    /**
+     * 检定
+     */
+    CHECK(1),
+    /**
+     * 更换
+     */
+    CHANGE(2),
+    /**
+     * 维修
+     */
+    REPAIR(3),
+    /**
+     * 退库
+     */
+    IN_STORE(4),
+    /**
+     * 报废
+     */
+    BAO_FEI(5);
+
+
+    private final Integer value;
+
+}

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

@@ -2,8 +2,10 @@ package com.platform.dao.mapper.sb;
 
 import com.platform.dao.dto.sb.SbChangeRecordDTO;
 import com.platform.dao.config.MyMapper;
+import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.entity.sb.SbChangeRecord;
 import com.platform.dao.vo.query.sb.SbChangeRecordVO;
+import com.platform.dao.vo.sb.SbInfoVO;
 import org.springframework.stereotype.Component;
 import java.util.List;
 
@@ -16,6 +18,7 @@ import java.util.List;
  */
 @Component
 public interface SbChangeRecordMapper extends MyMapper<SbChangeRecord> {
+    List<SbChangeRecordVO> getPositionNoHistory(SbChangeRecordDTO dto);
     /**
      * 分页查询
      * @param dto

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

@@ -22,6 +22,10 @@ import java.util.Map;
  */
 @Component
 public interface SbInfoMapper extends MyMapper<SbInfo> {
+
+
+    List<String> getChildIds(@Param("sbIds") List<String> sbIds);
+
     List<SbInfoTypeReportVO2> getsbNumsByType(SbInfoDTO dto);
     /**
      * 分页查询

platform-dao/src/main/java/com/platform/dao/vo/query/sb/SbChangeRecordVO.java

@@ -22,6 +22,7 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbChangeRecordVO extends BaseVO implements Serializable {
+    private Integer actionType;
     private Integer transformType;
 
     /**

platform-dao/src/main/java/com/platform/dao/vo/query/sb/SbMeasureLogVO.java

@@ -24,6 +24,10 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbMeasureLogVO extends BaseVO implements Serializable{
+    /**
+     * 1：检定，2：更换，3：维修，4：退库，5：报废
+     */
+    private Integer otherType;
     private LocalDate nextCheckDate;
     private String positionName;
     private String typeName;

platform-dao/src/main/java/com/platform/dao/vo/sb/YiBiaoHisroryVO.java

@@ -0,0 +1,34 @@
+package com.platform.dao.vo.sb;
+
+import com.platform.common.bean.BaseVO;
+import com.platform.dao.entity.upms.SysFile;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Transient;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author chenli
+ * @Date 2019/8/5
+ * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class YiBiaoHisroryVO extends BaseVO implements Serializable {
+   private String sbId;
+   private String sbName;
+   private String sbNo;
+   private String positionNo;
+   private LocalDateTime createdTime;
+   private String createdUserId;
+   private String createdUserName;
+   private List<YiBiaoHisroryVO> yiBiaoHisroryVOS;
+}

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

@@ -914,4 +914,29 @@ sb.scrap_user_name,sb.repair_dept_id,sb.sort_num
         </where>
         group by type.id
     </select>
+
+    <select id="getChildIds" parameterType="java.lang.String"
+    resultType="java.lang.String">
+        select id from t_sb_type
+        <where>
+        <if test="sbIds!=null">
+            and parent_id in
+            <foreach collection="sbIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        </where>
+    </select>
+
+<!--    <select id="getPositionNoHistory" parameterType="com.platform.dao.dto.sb.SbInfoDTO"-->
+<!--            resultType="com.platform.dao.vo.sb.SbInfoVO">-->
+<!--        select record.sb_no_id,sb.name as sbName,record.created_time ,record.created_user_id,record.creaed_user_name,-->
+<!--        from t_sb_info sb left join t_sb_change_record record-->
+<!--        on sb.id = record.sb_id-->
+<!--        <where>-->
+<!--            <if test="useType!=null">-->
+<!--                sb.use_type=#{useType}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
 </mapper>

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

@@ -134,6 +134,12 @@
             sb.card_no like concat('%',#{keyword},'%')
             )
         </if>
+        <if test="positionNo!=null and positionNo!=''">
+            sb.position_no like cancat('%',#{positionNo},'%')
+        </if>
+        <if test="otherType!=null and otherType!=''">
+            checkstandard.other_type = #{otherType}
+        </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.sb.SbMeasureLogDTO"
             resultType="com.platform.dao.vo.query.sb.SbMeasureLogVO">

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

@@ -9,7 +9,10 @@ import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.entity.sb.SbInfo;
+import com.platform.dao.entity.sb.SbType;
 import com.platform.dao.enums.SysRoleCodeEnum;
+import com.platform.dao.mapper.sb.SbInfoMapper;
+import com.platform.dao.mapper.sb.SbTypeMapper;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.util.TreeUtil;
 import com.platform.dao.vo.export.sb.ExportSbInfoDetailVO;
@@ -17,6 +20,7 @@ import com.platform.dao.vo.export.sb.ExportSbInfoMeasureVO;
 import com.platform.dao.vo.export.sb.ExportSbInfoVO;
 import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.dao.vo.sb.SbInfoWorkplaceVO;
+import com.platform.dao.vo.sb.SbTypeVO;
 import com.platform.office.poi.excel.ExcelImportUtil;
 import com.platform.office.poi.excel.entity.ImportParams;
 import com.platform.rest.log.annotation.SysLog;
@@ -32,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -49,6 +54,8 @@ public class SbInfoController {
     private final SbInfoService sbInfoService;
     private final SysUserRoleService sysUserRoleService;
     private final FillGatherTaskService fillGatherTaskService;
+    private final SbInfoMapper sbInfoMapper;
+    private final SbTypeMapper sbTypeMapper;
 
     /**
      * 设备工作台数据
@@ -542,17 +549,50 @@ public class SbInfoController {
 
     /**
      * 设备类型占比统计导出设备明细
-     * @param id
+     * @param
      * @return
      */
     @GetMapping("/export/sb/detail")
     @SysLog("设备基础信息导出")
     @PreAuthorize("@pms.hasPermission('sb-infos-export')")
     public void exportSbDetail(HttpServletResponse response, SbInfoDTO sbInfoDTO) {
-        List<SbInfoVO> list = sbInfoService.selectVOList(sbInfoDTO);
+        SbType type= sbTypeMapper.selectById(sbInfoDTO.getTypeId());
+        List<SbInfoVO> list = new ArrayList<>();
+        if (type!=null&&type.getParentId()!=null) {
+            List<String> ids = new ArrayList<>();
+            ids.add(type.getParentId());
+            List<String> queryIds = getSbIds(ids);
+            sbInfoDTO = new SbInfoDTO();
+            sbInfoDTO.setTypeList(queryIds);
+            list = sbInfoService.selectVOList(sbInfoDTO);
+        }
         ExcelUtil.exportResponseDict(response, ExportSbInfoDetailVO.class, BeanConverterUtil.copyListProperties(list, ExportSbInfoDetailVO.class), "设备基础信息");
     }
 
+    private List<String> getSbIds(List<String> ids){
+
+        if (ids!=null&&ids.size()>0) {
+            List<String> childIds = sbInfoMapper.getChildIds(ids);
+            ids.addAll(childIds);
+            if (childIds!=null&&childIds.size()>0){
+               getSbIds(childIds);
+            }else {
+                return null;
+            }
+        }
+        return ids;
+    }
+
+    /**
+     * 获取设备位号更改履历
+     * @param
+     * @return
+     */
+    @GetMapping("/positionNo/history")
+    public R getPositionNoHistory(SbInfoDTO dto){
+        return new R<>(sbInfoService.getPositionNoHistory(dto));
+    }
+
 
 
 }

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

@@ -177,27 +177,10 @@ public class SbMeasureLogController {
      */
     @GetMapping("/getLogBySbId")
     public R getLogBySbId(SbMeasureLogDTO checkStandardDTO) {
-        SbUpdateLog log = new SbUpdateLog();
-        log.setSbId(checkStandardDTO.getSbId());
-        List<SbUpdateLogVO> updateLogs = sbUpdateLogMapper.selectList(log);
+
         List<SbMeasureLogVO> measureLogVOS = sbMeasureLogService.selectList(checkStandardDTO);
-        for (SbMeasureLogVO vo:measureLogVOS){
-            if (vo.getLastDate()!=null&&vo.getPeriod()!=null){
-                if (vo.getPeriodType()==1){
-                    vo.setYouXiaoQi(vo.getLastDate().plusDays(vo.getPeriod()));
-                }else if(vo.getPeriodType()==2){
-                    vo.setYouXiaoQi(vo.getLastDate().plusWeeks(vo.getPeriod()));
-                }
-                else if(vo.getPeriodType()==3){
-                    vo.setYouXiaoQi(vo.getLastDate().plusMonths(vo.getPeriod()));
-                }
-
-            }
-        }
-        Map<String,Object> map = new HashMap<>();
-        map.put("1",updateLogs);
-        map.put("2",measureLogVOS);
-        return new R<>(map);
+
+        return new R<>(measureLogVOS);
     }
 
 }

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

@@ -13,6 +13,8 @@ import com.platform.dao.dto.sb.BatchSbMeasureLog;
 import com.platform.dao.dto.sb.SbMeasureLogDTO;
 import com.platform.dao.entity.sb.SbMeasureLog;
 import com.platform.dao.entity.sb.SbUpdateLog;
+import com.platform.dao.enums.SbMeasureLogOtherTypeEnum;
+import com.platform.dao.mapper.sb.SbMeasureLogMapper;
 import com.platform.dao.mapper.sb.SbUpdateLogMapper;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.sb.ExportSbMeasureLogVO;
@@ -42,7 +44,7 @@ import java.util.Map;
 public class SbUpdateLogController {
 
 
-    private final SbUpdateLogMapper sbUpdateLogMapper;
+    private final SbMeasureLogMapper sbMeasureLogMapper;
 
 
     /**
@@ -53,13 +55,14 @@ public class SbUpdateLogController {
      */
     @SysLog("新增设备计量记录")
     @PostMapping
-    public R save(@Validated({AddGroup.class}) @RequestBody SbUpdateLog sbUpdateLog) {
-        setCreateUserInfo(sbUpdateLog);
-        sbUpdateLog.setId(IdGeneratorUtils.getObjectId());
-        return new R<>(sbUpdateLogMapper.insert(sbUpdateLog));
+    public R save(@Validated({AddGroup.class}) @RequestBody SbMeasureLogDTO dto) {
+        setCreateUserInfo(dto);
+        dto.setId(IdGeneratorUtils.getObjectId());
+        SbMeasureLog log = BeanConverterUtil.copyObjectProperties(dto,SbMeasureLog.class);
+        return new R<>(sbMeasureLogMapper.insert(log));
     }
 
-    public void setCreateUserInfo(SbUpdateLog model) {
+    public void setCreateUserInfo(SbMeasureLogDTO model) {
         model.setCreatedTime(LocalDateTime.now());
         model.setUpdateTime(LocalDateTime.now());
         OauthUser user = SecurityUtils.getUser();

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

@@ -24,6 +24,8 @@ import java.util.Map;
  */
 public interface SbInfoService extends IBaseService<SbInfo, SbInfoDTO> {
 
+    List<SbInfoVO> getPositionNoHistory(SbInfoDTO dto);
+
     List<SbInfoTypeReportVO2> getSbNumReport(SbTypeDTO dto);
 
     List<SbInfoTypeReportVO2> getTypeReport(SbTypeDTO dto);

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

@@ -52,6 +52,7 @@ import com.platform.dao.util.compare.FieldComparedUtils;
 import com.platform.dao.vo.SysUserDeptVO;
 import com.platform.dao.vo.SysUserVO;
 import com.platform.dao.vo.export.sb.ExportSbInfoVO;
+import com.platform.dao.vo.query.sb.SbChangeRecordVO;
 import com.platform.dao.vo.query.upms.SysDeptVO;
 import com.platform.dao.vo.report.SbInfoTypeReportVO;
 import com.platform.dao.vo.report.SbInfoTypeReportVO2;
@@ -135,6 +136,77 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     private final SbChangeRecordMapper sbChangeRecordMapper;
     private final FillGatherTaskDetailMapper fillGatherTaskDetailMapper;
 
+    @Override
+    public List<SbInfoVO> getPositionNoHistory(SbInfoDTO dto) {
+        dto.setUseType(4);//仪表
+        List<SbInfoVO> sbInfoVOS = mapper.selectVOList(dto);
+        List<String> positionNos = sbInfoVOS.stream().map(SbInfoVO::getPositionNo).collect(Collectors.toList());
+        List<SbChangeRecord> sbChangeRecords = new ArrayList<>();
+//        if (positionNos!=null){
+            Weekend<SbChangeRecord> weekend = new Weekend<>(SbChangeRecord.class);
+            WeekendCriteria<SbChangeRecord,Object> weekendCriteria = weekend.weekendCriteria();
+//            weekendCriteria.andIn(SbChangeRecord::getSbNoId,positionNos);
+            weekendCriteria.andIsNotNull(SbChangeRecord::getActionType);
+            sbChangeRecords = sbChangeRecordMapper.selectByExample(weekend);
+//        }
+        List<SbChangeRecord> tempInList = new ArrayList<>();
+        List<SbChangeRecord> tempOutList = new ArrayList<>();
+        if (sbChangeRecords!=null) {
+            for (SbChangeRecord record : sbChangeRecords){
+                if (record.getActionType()==1){
+                    tempInList.add(record);
+                }else {
+                    tempOutList.add(record);
+                }
+            }
+        }
+
+        List<String> recordPositions = sbChangeRecords.stream().map(SbChangeRecord::getSbNoId).distinct().collect(Collectors.toList());
+        SbInfoDTO sbInfoDTO = new SbInfoDTO();
+        sbInfoDTO.setPositionIds(recordPositions);
+        List<SbInfoVO> sbInfoVOS2 =  mapper.selectVOList(sbInfoDTO);
+        for (String po:recordPositions){
+            for (SbInfoVO vo:sbInfoVOS2){
+                if (vo.getPositionNo()!=null&&vo.getPositionNo().equals(po)){
+                    YiBiaoHisroryVO yiBiaoHisroryVO = new YiBiaoHisroryVO();
+                    yiBiaoHisroryVO.setSbName(vo.getName());
+                    yiBiaoHisroryVO.setSbId(vo.getId());
+                    yiBiaoHisroryVO.setSbNo(vo.getNo());
+
+                }
+            }
+        }
+        for (String positions:recordPositions){
+            for (SbInfoVO vo:sbInfoVOS){
+                if (vo.getPositionNo()!=null&&vo.getPositionNo().equals(positions)){
+                    YiBiaoHisroryVO yiBiaoHisroryVO = new YiBiaoHisroryVO();
+                    yiBiaoHisroryVO.setSbName(vo.getName());
+                    yiBiaoHisroryVO.setSbId(vo.getId());
+                    yiBiaoHisroryVO.setSbNo(vo.getNo());
+                    for (SbChangeRecord record : sbChangeRecords){
+
+                    }
+//                    yiBiaoHisroryVO.setCreatedTime()
+                }
+            }
+        }
+//        List<String> inPositions = tempInList.stream().distinct().map(SbChangeRecord::getSbNoId).collect(Collectors.toList());
+//        List<String> outPositions = tempOutList.stream().map(SbChangeRecord::getSbNoId).collect(Collectors.toList());
+
+
+        if (sbChangeRecords!=null){
+            for (SbInfoVO vo:sbInfoVOS){
+                YiBiaoHisroryVO yiBiaoHisroryVO = new YiBiaoHisroryVO();
+                yiBiaoHisroryVO.setSbName(vo.getName());
+                yiBiaoHisroryVO.setSbNo(vo.getNo());
+                for (SbChangeRecord record:sbChangeRecords){
+//                    if (record.getSbId()!=null&&record.getSbId().equals(vo.get))
+                }
+            }
+        }
+        return null;
+    }
+
     @Override
     public int batchDelete(List<String> ids) {
         Weekend<SbInfo> weekend = new Weekend<>(SbInfo.class);
@@ -487,10 +559,29 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         if (model.getIsFinancing() == null) {
             model.setIsFinancing(SbInfoFinancingEnum.NOT.getValue());
         }
+
         setSaveDept(model);
         setSbStatusLogAndStopLog(model);
+
         // 保存修改记录
         SbInfo sbInfo = mapper.selectByPrimaryKey(model.getId());
+        if (model!=null&&model.getPositionNo()!=null&&sbInfo.getUseType()!=null&&sbInfo.getUseType()==4){
+            SbChangeRecord record = new SbChangeRecord();
+            record.setSbId(model.getId());
+            record.setSbNoId(sbInfo.getPositionNo());
+            UserInfo userInfo = SecurityUtils.getUserInfo();
+            record.setCreatedUserId(userInfo.getUserId());
+            record.setCreatedUserName(userInfo.getUsername());
+            record.setCreatedTime(LocalDateTime.now());
+            record.setId(IdGeneratorUtils.getObjectId());
+            record.setActionType(2);
+            sbChangeRecordMapper.insert(record);
+
+            record.setSbNoId(model.getPositionNo());
+            record.setId(IdGeneratorUtils.getObjectId());
+            record.setActionType(1);
+            sbChangeRecordMapper.insert(record);
+        }
         SbInfoDTO oldDTO = BeanConverterUtil.copyObjectProperties(sbInfo, SbInfoDTO.class);
         String updateInfo = FieldComparedUtils.compareBean(oldDTO, model);
         packageLogInfo(updateInfo, model.getId());
@@ -526,6 +617,8 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     }
 
 
+
+
     @Override
     public List<SbInfoTypeReportVO2> getSbNumReport(SbTypeDTO model) {
         List<SbInfoTypeReportVO2> sbInfoTypeReportVO2s = new ArrayList<>();

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

@@ -557,6 +557,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
                 }
                 setKey(sbChangeRecord);
                 sbChangeRecordMapper.insertSelective(sbChangeRecord);
+                item.setOtherType(SbMeasureLogOtherTypeEnum.CHECK.getValue());
                 this.saveModelByDTO(item);
             });
         }