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

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

@@ -54,7 +54,11 @@ public enum SysConfigEnum {
     REPAIR_NOTICE_SUCCESS_WECHAT_TEMPLATE_ID("派工后通知维修人"),
     REPAIR_HOLIDAY("节假日配置"),
     REPAIR_TWENTY_FOUR_USER("24小时值班人"),
-    SPARE_UPDATE_ALERT_DAY("备件更换预警设置天数");
+    SPARE_UPDATE_ALERT_DAY("备件更换预警设置天数"),
+    STATICS_SB_REPAIR_PROFESSOR("静设备维修专业"),
+    ACT_SB_REPAIR_PROFESSOR("动设备维修专业"),
+    DIAN_QI_SB_REPAIR_PROFESSOR("电气设备维修专业"),
+    YI_BIAO_SB_REPAIR_PROFESSOR("仪表设备维修专业");
     private final String typeName;
 
 }

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

@@ -5,11 +5,8 @@ import com.platform.common.exception.DeniedException;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.R;
 import com.platform.common.util.SecurityUtils;
-import com.platform.common.util.StringUtils;
 import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
-import com.platform.dao.dto.part.PartInfoDTO;
-import com.platform.dao.dto.repair.RepairProjectRelationDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.enums.SysRoleCodeEnum;
@@ -19,12 +16,10 @@ 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.SbTreeVO;
 import com.platform.office.poi.excel.ExcelImportUtil;
 import com.platform.office.poi.excel.entity.ImportParams;
 import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.sb.SbInfoService;
-import com.platform.service.sb.impl.SbInfoServiceImpl;
 import com.platform.service.upms.SysUserRoleService;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -527,4 +522,14 @@ public class SbInfoController {
         return new R<>(sbInfoService.getSbVOById(sbInfoDTO));
     }
 
+    /**
+     * 获取设备维修专业
+     * @param id
+     * @return
+     */
+    @GetMapping("/gain/repair/professor/{id}")
+    public R getRepairProfessor(@PathVariable("id") String id){
+        return new R<>(sbInfoService.getRepairProfessorBySbId(id));
+    }
+
 }

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

@@ -332,4 +332,11 @@ public interface SbInfoService extends IBaseService<SbInfo, SbInfoDTO> {
     List<SbInfoVO> getChildSbByIds(List<String> ids);
 
     List<SbInfoTypeReportVO> getTypeReport(SbInfoDTO dto, Integer year, LocalDate startMonth, LocalDate endMonth);
+
+    /**
+     * 获取设备对应的维修专业
+     * @param id
+     * @return
+     */
+    Integer getRepairProfessorBySbId(String id);
 }

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

@@ -2,7 +2,6 @@ package com.platform.service.sb.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
@@ -11,7 +10,6 @@ import com.platform.activiti.enums.ActApplyEnum;
 import com.platform.common.cache.ConfigCache;
 import com.platform.common.constant.CommonConstants;
 import com.platform.common.enums.DataFilterTypeEnum;
-import com.platform.common.enums.DictTypeEnum;
 import com.platform.common.enums.ResultCode;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.exception.DeniedException;
@@ -21,38 +19,28 @@ import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.check.CheckStandardDTO;
 import com.platform.dao.dto.part.PartInfoDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
-import com.platform.dao.dto.sb.SbMeasureLogDTO;
 import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.upms.SysDeptDTO;
 import com.platform.dao.dto.upms.SysUserDeptDTO;
 import com.platform.dao.dto.workplace.WorkplaceBacklogDTO;
 import com.platform.dao.dto.workplace.WorkplaceBacklogUserDTO;
 import com.platform.dao.entity.check.CheckStandard;
-import com.platform.dao.entity.fill.FillGather;
-import com.platform.dao.entity.fill.FillGatherTask;
 import com.platform.dao.entity.fill.FillGatherTaskDetail;
 import com.platform.dao.entity.firm.FirmProducer;
-import com.platform.dao.entity.operate.Article;
 import com.platform.dao.entity.part.PartInfo;
 import com.platform.dao.entity.part.PartType;
-import com.platform.dao.entity.remote.RemoteDegree;
-import com.platform.dao.entity.remote.RemoteMeasure;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.sb.*;
 import com.platform.dao.entity.upms.*;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.check.CheckStandardMapper;
 import com.platform.dao.mapper.fill.FillGatherTaskDetailMapper;
-import com.platform.dao.mapper.fill.FillGatherTaskMapper;
 import com.platform.dao.mapper.firm.FirmProducerMapper;
 import com.platform.dao.mapper.part.PartInfoMapper;
 import com.platform.dao.mapper.part.PartTypeMapper;
-import com.platform.dao.mapper.remote.RemoteDegreeMapper;
-import com.platform.dao.mapper.remote.RemoteMeasureMapper;
 import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
 import com.platform.dao.mapper.sb.*;
 import com.platform.dao.mapper.upms.SysDeptMapper;
-import com.platform.dao.mapper.upms.SysDictMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.mapper.workplace.WorkplaceBacklogUserMapper;
 import com.platform.dao.util.CustomExcelImportUtil;
@@ -60,15 +48,10 @@ import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.dao.util.UserUtil;
 import com.platform.dao.util.compare.FieldComparedUtils;
-import com.platform.dao.util.compare.annotation.FieldCompared;
 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.fill.FillGatherTaskDetailVO;
-import com.platform.dao.vo.query.fill.FillGatherTaskVO;
-import com.platform.dao.vo.query.sb.SbMeasureLogVO;
 import com.platform.dao.vo.query.upms.SysDeptVO;
-import com.platform.dao.vo.report.MeasureLogReportVO;
 import com.platform.dao.vo.report.SbInfoTypeReportVO;
 import com.platform.dao.vo.sb.*;
 import com.platform.office.annotation.Excel;
@@ -79,7 +62,7 @@ import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.part.PartInfoService;
 import com.platform.service.sb.SbInfoService;
 import com.platform.service.sb.SbModelSpareBomService;
-import com.platform.service.upms.SysDeptRelationService;
+import com.platform.service.upms.SysConfigService;
 import com.platform.service.upms.SysDeptService;
 import com.platform.service.upms.SysFileService;
 import com.platform.service.upms.SysUserDeptService;
@@ -116,33 +99,19 @@ import java.util.stream.Collectors;
 @Service("sbInfoService")
 @Slf4j
 public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbInfoDTO> implements SbInfoService {
-    private final RemoteMeasureMapper remoteMeasureMapper;
-    private final RemoteDegreeMapper remoteDegreeMapper;
-    private final SysDictMapper sysDictMapper;
     private final Environment environment;
-
     private final SysDeptMapper deptMapper;
-
     private final SbStatusLogMapper sbStatusLogMapper;
-
     private final SbStopLogMapper sbStopLogMapper;
-
     private final SysUserMapper sysUserMapper;
     private final SbTypeMapper sbTypeMapper;
     private final SbPositionMapper sbPositionMapper;
     private final RepairApplicationFormMapper repairApplicationFormMapper;
     private final SysFileService sysFileService;
     private final SysUserDeptService sysUserDeptService;
-
     private final SysDeptService sysDeptService;
-
     private final SbChangeLogMapper sbChangeLogMapper;
-
-    private final SbModelMapper sbModelMapper;
-
     private final FirmProducerMapper firmProducerMapper;
-    private final SysDeptRelationService sysDeptRelationService;
-
     private final PartInfoService partInfoService;
     private final SbModelSpareBomService sbModelSpareBomService;
     private final CheckStandardService checkStandardService;
@@ -152,6 +121,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     private final SbInfoMapper sbInfoMapper;
     private final SbModelSpareBomMapper sbModelSpareBomMapper;
     private final PartInfoMapper partInfoMapper;
+    private final SysConfigService sysConfigService;
 
     private final PartTypeMapper partTypeMapper;
     private final String useArea = "5e64ac691c527828b2114da0";
@@ -2761,4 +2731,58 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         }
         return result;
     }
+
+    /**
+     * 静设备 1  动设备 2  电气 3  仪表 4
+     * @param id
+     * @return
+     */
+    @Override
+    public Integer getRepairProfessorBySbId(String id) {
+        SbInfo sbInfo = mapper.selectByPrimaryKey(id);
+        if(sbInfo != null && StringUtils.isNotBlank(sbInfo.getTypeId())){
+            // 特种设备属于静设备
+            if(SbUseType.TZSB.getValue() == sbInfo.getUseType()){
+                return 1;
+            }else{
+                // 获取静设备集合
+                SysConfig config = sysConfigService.getByCode(SysConfigEnum.STATICS_SB_REPAIR_PROFESSOR.name());
+                if(config == null){
+                    throw new DeniedException("请设置静设备维修专业关联设备类别ID集合");
+                }
+                String tempStr = config.getContent();
+                if(tempStr.contains(sbInfo.getTypeId())){
+                    return 1;
+                }
+                // 获取动设备集合
+                config = sysConfigService.getByCode(SysConfigEnum.ACT_SB_REPAIR_PROFESSOR.name());
+                if(config == null){
+                    throw new DeniedException("请设置动设备维修专业关联设备类别ID集合");
+                }
+                tempStr = config.getContent();
+                if(tempStr.contains(sbInfo.getTypeId())){
+                    return 2;
+                }
+                // 获取电气集合
+                config = sysConfigService.getByCode(SysConfigEnum.DIAN_QI_SB_REPAIR_PROFESSOR.name());
+                if(config == null){
+                    throw new DeniedException("请设置动电气设备维修专业关联设备类别ID集合");
+                }
+                tempStr = config.getContent();
+                if(tempStr.contains(sbInfo.getTypeId())){
+                    return 3;
+                }
+                // 获取仪表集合
+                config = sysConfigService.getByCode(SysConfigEnum.YI_BIAO_SB_REPAIR_PROFESSOR.name());
+                if(config == null){
+                    throw new DeniedException("请设置仪表设备维修专业关联设备类别ID集合");
+                }
+                tempStr = config.getContent();
+                if(tempStr.contains(sbInfo.getTypeId())){
+                    return 4;
+                }
+            }
+        }
+        return null;
+    }
 }