From a50f62cba821582d3241fe6ccafca3a427e75b77 Mon Sep 17 00:00:00 2001 From: 79493 <794930212@qq.com> Date: Thu, 17 Nov 2022 18:06:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=A8=A1=E5=9D=97->=E4=BC=81=E4=B8=9A=E7=AB=AFPC,=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rzyc/mapper/EntDeviceInsCycleMapper.java | 8 +++ .../EntDeviceMaintenancePlanMapper.java | 3 +- .../EntDeviceMaintenanceRecordMapper.java | 3 +- .../mapper/EntInspectionRecordMapper.java | 3 +- .../mapper/EntOperatingInstructionMapper.java | 4 +- .../com/rzyc/mapper/EntRepairPlanMapper.java | 3 +- .../rzyc/mapper/EntRepairRecordMapper.java | 3 +- .../rzyc/mapper/EntReportRepairMapper.java | 3 +- .../rzyc/mapper/EntUserCredentialMapper.java | 5 +- .../com/rzyc/model/EntDeviceInsCycle.java | 5 ++ .../java/com/rzyc/model/EntInsRecord.java | 14 +++- .../AddOrUpdateDeviceInspectionCycleDto.java | 11 +++ .../dto/AddOrUpdateInspectionRecordDto.java | 8 ++- .../model/dto/OperatingInstructionDto.java | 19 ++++- .../mapper/EntDeviceInsCycleMapper.xml | 7 +- .../mapper/EntDeviceMaintenancePlanMapper.xml | 2 +- .../EntDeviceMaintenanceRecordMapper.xml | 2 +- .../resources/mapper/EntInsRecordMapper.xml | 6 +- .../mapper/EntInspectionRecordMapper.xml | 2 +- .../mapper/EntOperatingInstructionMapper.xml | 4 +- .../resources/mapper/EntRepairPlanMapper.xml | 2 +- .../mapper/EntRepairRecordMapper.xml | 2 +- .../mapper/EntReportRepairMapper.xml | 2 +- .../mapper/EntUserCredentialMapper.xml | 12 +++- .../EnterpriseEquipmentController.java | 28 ++++---- .../rzyc/controller/PersonalController.java | 6 +- .../com/rzyc/service/PcBusinessService.java | 70 ++++++++++++++----- .../java/com/common/utils/model/Message.java | 2 + 28 files changed, 180 insertions(+), 59 deletions(-) diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceInsCycleMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceInsCycleMapper.java index b8ebb34..410f85f 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceInsCycleMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceInsCycleMapper.java @@ -47,4 +47,12 @@ public interface EntDeviceInsCycleMapper extends BaseMapper { * @return int * */ List checkDeviceInspectionRecord(String date); + + + /** + * 查询周期巡检通过设备id + * @param deviceId 设备id + * @return 周期巡检 + * */ + EntDeviceInsCycle selectByDeviceId(String deviceId); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenancePlanMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenancePlanMapper.java index d29a5b5..09becdc 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenancePlanMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenancePlanMapper.java @@ -28,8 +28,9 @@ public interface EntDeviceMaintenancePlanMapper extends BaseMapperselectEntDeviceMaintenancePlanList(); + ListselectEntDeviceMaintenancePlanList(String deviceId); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenanceRecordMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenanceRecordMapper.java index 6a40b1d..61b028e 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenanceRecordMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMaintenanceRecordMapper.java @@ -28,8 +28,9 @@ public interface EntDeviceMaintenanceRecordMapper extends BaseMapperselectEntDeviceMaintenanceRecord(); + ListselectEntDeviceMaintenanceRecord(String deviceId); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntInspectionRecordMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntInspectionRecordMapper.java index dda1571..152287c 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntInspectionRecordMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntInspectionRecordMapper.java @@ -24,8 +24,9 @@ public interface EntInspectionRecordMapper extends BaseMapperselectInspectionRecord(@Param("startTime") String startTime,@Param("endTime") String endTime); + ListselectInspectionRecord(@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("deviceId") String deviceId); /** diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntOperatingInstructionMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntOperatingInstructionMapper.java index 99a175a..0c8aa8b 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntOperatingInstructionMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntOperatingInstructionMapper.java @@ -22,9 +22,11 @@ public interface EntOperatingInstructionMapper extends BaseMapperselectOperatingInstructions(String name); + ListselectOperatingInstructions(@Param("name") String name,@Param("deviceId") String deviceId); + /** diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntRepairPlanMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntRepairPlanMapper.java index c62e632..7245b4d 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntRepairPlanMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntRepairPlanMapper.java @@ -20,9 +20,10 @@ public interface EntRepairPlanMapper extends BaseMapper { /** * 企业维修计划查询 + * @param deviceId * @return list * */ - ListselectRepairPlan(); + ListselectRepairPlan(String deviceId); /** diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntRepairRecordMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntRepairRecordMapper.java index 166698c..f9579f3 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntRepairRecordMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntRepairRecordMapper.java @@ -19,8 +19,9 @@ public interface EntRepairRecordMapper extends BaseMapper { /** * 查询维修记录 + * @param deviceId * @return List * */ - ListrepairRecord(); + ListrepairRecord(String deviceId); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntReportRepairMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntReportRepairMapper.java index 77c8a93..1c09867 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntReportRepairMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntReportRepairMapper.java @@ -20,9 +20,10 @@ public interface EntReportRepairMapper extends BaseMapper { /** * 查询报修列表 + * @param deviceId * @return list * */ - ListreportRecord(); + ListreportRecord(String deviceId); /** * 修改报修列表 diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntUserCredentialMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntUserCredentialMapper.java index fc5dccb..89839cb 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntUserCredentialMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntUserCredentialMapper.java @@ -21,12 +21,13 @@ public interface EntUserCredentialMapper extends BaseMapper { /** - * 企业用户岗位职责 + * 企业用户证照表 * @param enterpriseId 企业id * @param entUserId 企业用户id + * @param credentialState 证件 * @return EntUserCredential 企业用户证照 * */ - ListselectEntUserCredential(@Param("enterpriseId") String enterpriseId, @Param("entUserId")String entUserId); + ListselectEntUserCredential(@Param("enterpriseId") String enterpriseId, @Param("entUserId")String entUserId,@Param("credentialState") Integer credentialState); /** diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceInsCycle.java b/inventory-dao/src/main/java/com/rzyc/model/EntDeviceInsCycle.java index 626fcf7..20534f6 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceInsCycle.java +++ b/inventory-dao/src/main/java/com/rzyc/model/EntDeviceInsCycle.java @@ -56,6 +56,7 @@ public class EntDeviceInsCycle implements Serializable { @TableField("inspection_charge_person") private String inspectionChargePerson; + @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "最后巡检日期") @TableField("last_inspection_date") private Date lastInspectionDate; @@ -96,6 +97,10 @@ public class EntDeviceInsCycle implements Serializable { @TableField(exist = false) private Date insRecordDate; + + + + public Date getInsRecordDate() { return insRecordDate; } diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntInsRecord.java b/inventory-dao/src/main/java/com/rzyc/model/EntInsRecord.java index 6880a36..1253c32 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntInsRecord.java +++ b/inventory-dao/src/main/java/com/rzyc/model/EntInsRecord.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -21,10 +23,11 @@ public class EntInsRecord implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "巡检记录") + @ApiModelProperty(value = "巡检记录id") @TableField("ins_record_id") private String insRecordId; + @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "巡检日期") @TableField("ins_record_date") private Date insRecordDate; @@ -69,7 +72,16 @@ public class EntInsRecord implements Serializable { @TableField("create_by") private String createBy; + @TableField(exist = false) + private String inspectionName; + public String getInspectionName() { + return inspectionName; + } + + public void setInspectionName(String inspectionName) { + this.inspectionName = inspectionName; + } public String getCycleId() { return cycleId; diff --git a/inventory-dao/src/main/java/com/rzyc/model/dto/AddOrUpdateDeviceInspectionCycleDto.java b/inventory-dao/src/main/java/com/rzyc/model/dto/AddOrUpdateDeviceInspectionCycleDto.java index 5f6ef31..d612f5f 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/dto/AddOrUpdateDeviceInspectionCycleDto.java +++ b/inventory-dao/src/main/java/com/rzyc/model/dto/AddOrUpdateDeviceInspectionCycleDto.java @@ -30,6 +30,9 @@ public class AddOrUpdateDeviceInspectionCycleDto { @ApiModelProperty("巡检周期") private Integer inspectionCycle; + @ApiModelProperty(value = "巡检级别 1.一般 2.重大 3.紧急巡检") + private Integer inspectionState; + @ApiModelProperty("巡检负责人") private String inspectionChargePerson; @@ -52,6 +55,14 @@ public class AddOrUpdateDeviceInspectionCycleDto { @TableField("next_time_inspection") private Date nextTimeInspection; + public Integer getInspectionState() { + return inspectionState; + } + + public void setInspectionState(Integer inspectionState) { + this.inspectionState = inspectionState; + } + public Date getNextTimeInspection() { return nextTimeInspection; } diff --git a/inventory-dao/src/main/java/com/rzyc/model/dto/AddOrUpdateInspectionRecordDto.java b/inventory-dao/src/main/java/com/rzyc/model/dto/AddOrUpdateInspectionRecordDto.java index f7203e1..144dc7a 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/dto/AddOrUpdateInspectionRecordDto.java +++ b/inventory-dao/src/main/java/com/rzyc/model/dto/AddOrUpdateInspectionRecordDto.java @@ -3,6 +3,8 @@ package com.rzyc.model.dto; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; + /** * 企业设备巡检记录 * @author Xuwanxin @@ -14,7 +16,7 @@ public class AddOrUpdateInspectionRecordDto { private String insRecordId; @ApiModelProperty(value = "巡检日期") - private String insRecordDate; + private Date insRecordDate; @ApiModelProperty(value = "巡检记录工时") private Integer insRecordWorkingHour; @@ -53,11 +55,11 @@ public class AddOrUpdateInspectionRecordDto { this.insRecordId = insRecordId; } - public String getInsRecordDate() { + public Date getInsRecordDate() { return insRecordDate; } - public void setInsRecordDate(String insRecordDate) { + public void setInsRecordDate(Date insRecordDate) { this.insRecordDate = insRecordDate; } diff --git a/inventory-dao/src/main/java/com/rzyc/model/dto/OperatingInstructionDto.java b/inventory-dao/src/main/java/com/rzyc/model/dto/OperatingInstructionDto.java index df03e3c..5fa5ea3 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/dto/OperatingInstructionDto.java +++ b/inventory-dao/src/main/java/com/rzyc/model/dto/OperatingInstructionDto.java @@ -1,12 +1,29 @@ package com.rzyc.model.dto; + +/** + * 送检记录dto + * @author Xuwanxin + * @date 2022/10/27 + * */ public class OperatingInstructionDto { - private String name; + private String name; + + private String deviceId; private Integer page; private Integer pageSize; + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + public String getName() { return name; } diff --git a/inventory-dao/src/main/resources/mapper/EntDeviceInsCycleMapper.xml b/inventory-dao/src/main/resources/mapper/EntDeviceInsCycleMapper.xml index b5a6378..28b7a7d 100644 --- a/inventory-dao/src/main/resources/mapper/EntDeviceInsCycleMapper.xml +++ b/inventory-dao/src/main/resources/mapper/EntDeviceInsCycleMapper.xml @@ -45,10 +45,15 @@ + + diff --git a/inventory-dao/src/main/resources/mapper/EntDeviceMaintenancePlanMapper.xml b/inventory-dao/src/main/resources/mapper/EntDeviceMaintenancePlanMapper.xml index 6bc815b..8ef47a2 100644 --- a/inventory-dao/src/main/resources/mapper/EntDeviceMaintenancePlanMapper.xml +++ b/inventory-dao/src/main/resources/mapper/EntDeviceMaintenancePlanMapper.xml @@ -32,6 +32,6 @@ diff --git a/inventory-dao/src/main/resources/mapper/EntDeviceMaintenanceRecordMapper.xml b/inventory-dao/src/main/resources/mapper/EntDeviceMaintenanceRecordMapper.xml index 48b9aec..78c2674 100644 --- a/inventory-dao/src/main/resources/mapper/EntDeviceMaintenanceRecordMapper.xml +++ b/inventory-dao/src/main/resources/mapper/EntDeviceMaintenanceRecordMapper.xml @@ -36,6 +36,6 @@ diff --git a/inventory-dao/src/main/resources/mapper/EntInsRecordMapper.xml b/inventory-dao/src/main/resources/mapper/EntInsRecordMapper.xml index 3d5711c..8e6a058 100644 --- a/inventory-dao/src/main/resources/mapper/EntInsRecordMapper.xml +++ b/inventory-dao/src/main/resources/mapper/EntInsRecordMapper.xml @@ -16,6 +16,7 @@ + @@ -30,9 +31,10 @@ diff --git a/inventory-dao/src/main/resources/mapper/EntInspectionRecordMapper.xml b/inventory-dao/src/main/resources/mapper/EntInspectionRecordMapper.xml index 316e64a..c9e701a 100644 --- a/inventory-dao/src/main/resources/mapper/EntInspectionRecordMapper.xml +++ b/inventory-dao/src/main/resources/mapper/EntInspectionRecordMapper.xml @@ -23,7 +23,7 @@ - select * from ent_operating_instruction + select * from ent_operating_instruction where device_id = #{deviceId} - where op_instruction_name like concat('%',#{name},'%') + and op_instruction_name like concat('%',#{name},'%') diff --git a/inventory-dao/src/main/resources/mapper/EntRepairPlanMapper.xml b/inventory-dao/src/main/resources/mapper/EntRepairPlanMapper.xml index c6d78f7..c7e72d8 100644 --- a/inventory-dao/src/main/resources/mapper/EntRepairPlanMapper.xml +++ b/inventory-dao/src/main/resources/mapper/EntRepairPlanMapper.xml @@ -23,7 +23,7 @@ diff --git a/inventory-dao/src/main/resources/mapper/EntRepairRecordMapper.xml b/inventory-dao/src/main/resources/mapper/EntRepairRecordMapper.xml index 445ee22..148c7ef 100644 --- a/inventory-dao/src/main/resources/mapper/EntRepairRecordMapper.xml +++ b/inventory-dao/src/main/resources/mapper/EntRepairRecordMapper.xml @@ -32,7 +32,7 @@ diff --git a/inventory-dao/src/main/resources/mapper/EntReportRepairMapper.xml b/inventory-dao/src/main/resources/mapper/EntReportRepairMapper.xml index 47748bf..451d52f 100644 --- a/inventory-dao/src/main/resources/mapper/EntReportRepairMapper.xml +++ b/inventory-dao/src/main/resources/mapper/EntReportRepairMapper.xml @@ -22,7 +22,7 @@ diff --git a/inventory-dao/src/main/resources/mapper/EntUserCredentialMapper.xml b/inventory-dao/src/main/resources/mapper/EntUserCredentialMapper.xml index a9caada..75ce61b 100644 --- a/inventory-dao/src/main/resources/mapper/EntUserCredentialMapper.xml +++ b/inventory-dao/src/main/resources/mapper/EntUserCredentialMapper.xml @@ -23,7 +23,17 @@ diff --git a/inventory-ent/src/main/java/com/rzyc/controller/EnterpriseEquipmentController.java b/inventory-ent/src/main/java/com/rzyc/controller/EnterpriseEquipmentController.java index 7001f22..6a25e56 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/EnterpriseEquipmentController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/EnterpriseEquipmentController.java @@ -249,7 +249,7 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('entDeviceMaintenancePlan:update')") @MethodAnnotation(authorizations = {"entDeviceMaintenancePlan:update"},name = "保养计划-新增和修改") @ResponseBody - public SingleResult entDeviceMaintenancePlanUpdate(EntDeviceMaintenancePlanDto deviceMaintenancePlanDto)throws Exception{ + public SingleResult entDeviceMaintenancePlanUpdate(@RequestBody EntDeviceMaintenancePlanDto deviceMaintenancePlanDto)throws Exception{ return pcBusinessService.entDeviceMaintenancePlanUpdate(deviceMaintenancePlanDto); } @@ -264,8 +264,8 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('entDeviceMaintenancePlan','entDeviceMaintenancePlan:update')") @MethodAnnotation(authorizations = {"entDeviceMaintenancePlan","entDeviceMaintenancePlan:update"},name = "保养计划列表") @ResponseBody - public SingleResult> entDeviceMaintenancePlan(Integer page, Integer pageSize)throws Exception{ - return pcBusinessService.entDeviceMaintenancePlan(page,pageSize) ; + public SingleResult> entDeviceMaintenancePlan(String deviceId,Integer page, Integer pageSize)throws Exception{ + return pcBusinessService.entDeviceMaintenancePlan(deviceId,page,pageSize) ; } @@ -280,7 +280,7 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('entDeviceMaintenanceRecord:update')") @MethodAnnotation(authorizations = {"entDeviceMaintenanceRecord:update"},name = "保养记录-新增和修改") @ResponseBody - public SingleResult entDeviceMaintenanceRecordUpdate(EntDeviceMaintenanceRecordDto entDeviceMaintenanceRecordDto)throws Exception{ + public SingleResult entDeviceMaintenanceRecordUpdate(@RequestBody EntDeviceMaintenanceRecordDto entDeviceMaintenanceRecordDto)throws Exception{ return pcBusinessService.entDeviceMaintenanceRecordUpdate(entDeviceMaintenanceRecordDto); } @@ -297,8 +297,8 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('entDeviceMaintenanceRecord','entDeviceMaintenanceRecord:update')") @MethodAnnotation(authorizations = {"entDeviceMaintenanceRecord","entDeviceMaintenanceRecord:update"},name = "保养记录") @ResponseBody - public SingleResult> entDeviceMaintenanceRecord(Integer page,Integer pageSize)throws Exception{ - return pcBusinessService.entDeviceMaintenanceRecord(page,pageSize); + public SingleResult> entDeviceMaintenanceRecord(String deviceId,Integer page,Integer pageSize)throws Exception{ + return pcBusinessService.entDeviceMaintenanceRecord(deviceId,page,pageSize); } @@ -313,8 +313,8 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('inspectionRecord','inspectionRecord:update')") @MethodAnnotation(authorizations = {"inspectionRecord","inspectionRecord:update"},name = "送检记录") @ResponseBody - public SingleResult> inspectionRecord(@Param("startTime") String startTime, @Param("endTime")String endTime,Integer page,Integer pageSize)throws Exception { - return pcBusinessService.inspectionRecord(startTime, endTime, page, pageSize); + public SingleResult> inspectionRecord(@Param("startTime") String startTime, @Param("endTime")String endTime,Integer page,Integer pageSize,String deviceId)throws Exception { + return pcBusinessService.inspectionRecord(startTime, endTime, page, pageSize,deviceId); } @@ -344,8 +344,8 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('repairPlan','repairPlan:update')") @MethodAnnotation(authorizations = {"repairPlan","repairPlan:update"},name = "维修计划") @ResponseBody - public SingleResult repairPlan(Integer page,Integer pageSize)throws Exception{ - return pcBusinessService.repairPlan(page,pageSize); + public SingleResult repairPlan(String deviceId,Integer page,Integer pageSize)throws Exception{ + return pcBusinessService.repairPlan(page,pageSize,deviceId); } /** @@ -375,8 +375,8 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('repairRecord','repairRecord:update')") @MethodAnnotation(authorizations = {"repairRecord","repairRecord:update"},name = "维修记录") @ResponseBody - public SingleResult repairRecord(Integer page,Integer pageSize)throws Exception{ - return pcBusinessService.repairRecord(page,pageSize); + public SingleResult repairRecord(Integer page,Integer pageSize,String deviceId)throws Exception{ + return pcBusinessService.repairRecord(page,pageSize,deviceId); } /** @@ -389,8 +389,8 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('reportRecord','reportRecord:update')") @MethodAnnotation(authorizations = {"reportRecord","reportRecord:update"},name = "报修记录") @ResponseBody - public SingleResult reportRecord(Integer page,Integer pageSize)throws Exception{ - return pcBusinessService.reportRecord(page,pageSize); + public SingleResult reportRecord(Integer page,Integer pageSize,String deviceId)throws Exception{ + return pcBusinessService.reportRecord(page,pageSize,deviceId); } /** diff --git a/inventory-ent/src/main/java/com/rzyc/controller/PersonalController.java b/inventory-ent/src/main/java/com/rzyc/controller/PersonalController.java index c244864..95bfb65 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/PersonalController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/PersonalController.java @@ -270,13 +270,15 @@ public class PersonalController extends BaseController{ @ApiImplicitParam(name = "entUserId", value = "企业用户id",required = true, dataType = "string"), @ApiImplicitParam(name = "page", value = "page",required = true, dataType = "int"), @ApiImplicitParam(name = "pageSize", value = "pageSize",required = true, dataType = "int"), + @ApiImplicitParam(name = "credentialState", value = "证件过期 1.未过期 2.已超时",required = false, dataType = "int"), + @ApiImplicitParam(name = "enterpriseId", value = "企业id",required = false, dataType = "string"), }) @GetMapping(value = "/entUserCredential") @PreAuthorize("hasAnyAuthority('entUserCredential','entUserCredential:update')") @MethodAnnotation(authorizations = {"entUserCredential","entUserCredential:update"},name = "企业用户证照表") @ResponseBody - public SingleResult> entUserCredential(@RequestParam(required = true) String entUserId, @RequestParam(required = true) Integer page, @RequestParam(required = true)Integer pageSize)throws Exception{ - return pcBusinessService.entUserCredential(null,entUserId,page,pageSize); + public SingleResult> entUserCredential(@RequestParam(required = true) String entUserId, @RequestParam(required = true) Integer page, @RequestParam(required = true)Integer pageSize,Integer credentialState,String enterpriseId)throws Exception{ + return pcBusinessService.entUserCredential(enterpriseId,entUserId,page,pageSize,credentialState); } /** diff --git a/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java b/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java index 59907b6..81727e8 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java +++ b/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java @@ -153,9 +153,9 @@ public class PcBusinessService extends BaseController { } @PageOperation - public SingleResult entUserCredential(String enterpriseId, String entUserId,Integer page,Integer pageSize){ + public SingleResult entUserCredential(String enterpriseId, String entUserId,Integer page,Integer pageSize,Integer credentialState){ SingleResult singleResult = new SingleResult(); - Pagelist = (Page) entUserCredentialMapper.selectEntUserCredential(enterpriseId,entUserId); + Pagelist = (Page) entUserCredentialMapper.selectEntUserCredential(enterpriseId,entUserId,credentialState); singleResult.setDataPager(list); return singleResult; } @@ -258,7 +258,8 @@ public class PcBusinessService extends BaseController { } singleResult = this.entUserCredentialUpdate(addOrUpdateEntUserDto.getEntUserCredentialUpdateDtos()); } - + //插入清单和任务 + autoAssignmentTask(entUser.getEntUserId(),addOrUpdateEntUserDto.getEnterpriseId(),addOrUpdateEntUserDto.getPostId()); return singleResult; } @@ -445,6 +446,12 @@ public class PcBusinessService extends BaseController { public SingleResult addOrUpdateDeviceInspectionCycle(AddOrUpdateDeviceInspectionCycleDto addOrUpdateDeviceInspectionCycleDto) throws Exception { SingleResult singleResult = new SingleResult(); + EntDeviceInsCycle cycle = entDeviceInsCycleMapper.selectByDeviceId(addOrUpdateDeviceInspectionCycleDto.getDeviceId()); + if (null != cycle){ + singleResult.setCode(Code.ERROR.getCode()); + singleResult.setMessage(Message.NOT_ONLY_INSPECTION_CYCLE); + return singleResult; + } Integer result = 0; EntDeviceInsCycle entDeviceInsCycle = new EntDeviceInsCycle(); BeanUtils.copyProperties(addOrUpdateDeviceInspectionCycleDto,entDeviceInsCycle); @@ -466,10 +473,18 @@ public class PcBusinessService extends BaseController { SingleResult singleResult = new SingleResult(); EntInsRecord entInsRecord = new EntInsRecord(); BeanUtils.copyProperties(addOrUpdateInspectionRecordDto,entInsRecord); + //存放设备的周期巡检id + EntDeviceInsCycle cycle = entDeviceInsCycleMapper.selectByDeviceId(addOrUpdateInspectionRecordDto.getDeviceId()); int result = 0; if (null != addOrUpdateInspectionRecordDto && null != addOrUpdateInspectionRecordDto.getInsRecordId()){ + if (cycle != null) { + entInsRecord.setCycleId(cycle.getInspectionId()); + } result = entInsRecordMapper.updateInspectionRecord(entInsRecord); }else { + if (cycle != null) { + entInsRecord.setCycleId(cycle.getInspectionId()); + } result = entInsRecordMapper.insert(entInsRecord); } if (result != 1 ){ @@ -531,9 +546,9 @@ public class PcBusinessService extends BaseController { } @PageOperation - public SingleResult entDeviceMaintenancePlan(Integer page,Integer pageSize){ + public SingleResult entDeviceMaintenancePlan(String deviceId,Integer page,Integer pageSize){ SingleResult singleResult = new SingleResult(); - Page list = (Page) entDeviceMaintenancePlanMapper.selectEntDeviceMaintenancePlanList(); + Page list = (Page) entDeviceMaintenancePlanMapper.selectEntDeviceMaintenancePlanList(deviceId); singleResult.setDataPager(list); return singleResult; } @@ -556,25 +571,25 @@ public class PcBusinessService extends BaseController { } @PageOperation - public SingleResult entDeviceMaintenanceRecord(Integer page,Integer pageSize){ + public SingleResult entDeviceMaintenanceRecord(String deviceId,Integer page,Integer pageSize){ SingleResult singleResult = new SingleResult(); - Page list = (Page) entDeviceMaintenanceRecordMapper.selectEntDeviceMaintenanceRecord(); + Page list = (Page) entDeviceMaintenanceRecordMapper.selectEntDeviceMaintenanceRecord(deviceId); singleResult.setDataPager(list); return singleResult; } @PageOperation - public SingleResult inspectionRecord(String startTime,String endTime,Integer page,Integer pageSize){ + public SingleResult inspectionRecord(String startTime,String endTime,Integer page,Integer pageSize,String deviceId){ SingleResult singleResult = new SingleResult(); - PageinspectionRecords = (Page) entInspectionRecordMapper.selectInspectionRecord(startTime,endTime); + PageinspectionRecords = (Page) entInspectionRecordMapper.selectInspectionRecord(startTime,endTime,deviceId); singleResult.setDataPager(inspectionRecords); return singleResult; } @PageOperation - public SingleResult repairPlan(Integer page,Integer pageSize){ + public SingleResult repairPlan(Integer page,Integer pageSize,String deviceId){ SingleResult singleResult = new SingleResult(); - PageentRepairPlans = (Page) entRepairPlanMapper.selectRepairPlan(); + PageentRepairPlans = (Page) entRepairPlanMapper.selectRepairPlan(deviceId); singleResult.setDataPager(entRepairPlans); return singleResult; } @@ -614,17 +629,17 @@ public class PcBusinessService extends BaseController { } @PageOperation - public SingleResult repairRecord(Integer page,Integer pageSize){ + public SingleResult repairRecord(Integer page,Integer pageSize,String deviceId){ SingleResult singleResult = new SingleResult(); - Page repairRecords = (Page) entRepairRecordMapper.repairRecord(); + Page repairRecords = (Page) entRepairRecordMapper.repairRecord(deviceId); singleResult.setDataPager(repairRecords); return singleResult; } @PageOperation - public SingleResult reportRecord(Integer page,Integer pageSize){ + public SingleResult reportRecord(Integer page,Integer pageSize,String deviceId){ SingleResult singleResult = new SingleResult(); - PagereportRepairs = (Page) entReportRepairMapper.reportRecord(); + PagereportRepairs = (Page) entReportRepairMapper.reportRecord(deviceId); singleResult.setDataPager(reportRepairs); return singleResult; } @@ -649,7 +664,7 @@ public class PcBusinessService extends BaseController { @PageOperation public SingleResult operatingInstructions(OperatingInstructionDto operatingInstructionDto){ SingleResult SingleResult = new SingleResult(); - Page page = (Page) entOperatingInstructionMapper.selectOperatingInstructions(operatingInstructionDto.getName()); + Page page = (Page) entOperatingInstructionMapper.selectOperatingInstructions(operatingInstructionDto.getName(),operatingInstructionDto.getDeviceId()); SingleResult.setDataPager(page); return SingleResult; } @@ -674,8 +689,29 @@ public class PcBusinessService extends BaseController { public SingleResult manualAssignmentTask(AddOrUpdateEntUserPostListDto addOrUpdateEntUserPostTaskDto) throws Exception { - SingleResult singleResult = new SingleResult(); + return insertListAndTask(addOrUpdateEntUserPostTaskDto); + } + + public void autoAssignmentTask(String userId,String enterpriseId,String postId) throws Exception { + ListinEntLists = inEntListMapper.selectByEnterpriseId(enterpriseId); + for (InEntList ie:inEntLists) { + AddOrUpdateEntUserPostListDto addOrUpdateEntUserPostTaskDto = new AddOrUpdateEntUserPostListDto(); + addOrUpdateEntUserPostTaskDto.setEntUserId(userId); + addOrUpdateEntUserPostTaskDto.setEnterpriseId(enterpriseId); + addOrUpdateEntUserPostTaskDto.setPostId(postId); + addOrUpdateEntUserPostTaskDto.setEntListId(ie.getEntListId()); + addOrUpdateEntUserPostTaskDto.setFrequency(ie.getFrequency()); + addOrUpdateEntUserPostTaskDto.setItemContent(ie.getItemContent()); + addOrUpdateEntUserPostTaskDto.setItemTitle(ie.getItemTitle()); + addOrUpdateEntUserPostTaskDto.setListId(ie.getListId()); + addOrUpdateEntUserPostTaskDto.setStandard(ie.getStandard()); + insertListAndTask(addOrUpdateEntUserPostTaskDto); + } + } + + private SingleResult insertListAndTask(AddOrUpdateEntUserPostListDto addOrUpdateEntUserPostTaskDto) throws Exception { EntPostList entPostList = new EntPostList(); + SingleResult singleResult = new SingleResult(); BeanUtils.copyProperties(addOrUpdateEntUserPostTaskDto,entPostList); entPostList.setCreateBy(getUserId()); entPostList.setCreateTime(new Date()); diff --git a/utils/src/main/java/com/common/utils/model/Message.java b/utils/src/main/java/com/common/utils/model/Message.java index 01e9321..15e4695 100644 --- a/utils/src/main/java/com/common/utils/model/Message.java +++ b/utils/src/main/java/com/common/utils/model/Message.java @@ -172,4 +172,6 @@ public class Message { public static final String MOBILE_IS_ILLEGAL="手机号非法"; public static final String CANT_ADD_IN_COMPANY_LEVEL = "不允许在公司下直接编辑人员"; + + public static final String NOT_ONLY_INSPECTION_CYCLE = "已经存在周期巡检,仅仅允许一个"; }