From 3db6f5282577b9606d15e5a7553d8fa9b3ca6fc7 Mon Sep 17 00:00:00 2001 From: 79493 <794930212@qq.com> Date: Wed, 16 Nov 2022 18:05:29 +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 | 13 +++- .../java/com/rzyc/mapper/EntDeviceMapper.java | 18 +++++ .../com/rzyc/mapper/EntInsRecordMapper.java | 3 +- .../main/java/com/rzyc/model/EntDevice.java | 78 +++++++++++++++++++ .../com/rzyc/model/EntDeviceInsCycle.java | 15 ++++ .../java/com/rzyc/model/EntDeviceType.java | 14 ++++ .../AddOrUpdateDeviceInspectionCycleDto.java | 3 +- .../mapper/EntDeviceInsCycleMapper.xml | 12 ++- .../main/resources/mapper/EntDeviceMapper.xml | 45 ++++++++++- .../resources/mapper/EntInsRecordMapper.xml | 2 +- .../com/rzyc/advice/SaticScheduleTask.java | 8 +- .../EmergencyEquipmentController.java | 9 ++- .../EnterpriseEquipmentController.java | 60 ++++++++++++-- .../rzyc/service/DeviceInspectionCycle.java | 43 ++++++++++ .../com/rzyc/service/PcBusinessService.java | 23 ++++-- .../java/com/rzyc/service/TaskService.java | 16 +++- .../com/rzyc/utils/StringEncryptorTest.java | 11 ++- 17 files changed, 343 insertions(+), 30 deletions(-) create mode 100644 inventory-ent/src/main/java/com/rzyc/service/DeviceInspectionCycle.java 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 1208bc0..b8ebb34 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceInsCycleMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceInsCycleMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import org.springframework.web.bind.annotation.RequestBody; +import java.util.Date; import java.util.List; /** @@ -24,9 +25,10 @@ public interface EntDeviceInsCycleMapper extends BaseMapper { /** * 查询周期巡检 * @param inspectionName 巡检名 + * @param deviceId 设备id * @return list * */ - ListdeviceInspectionCycle(String inspectionName); + ListdeviceInspectionCycle(@Param("inspectionName") String inspectionName,@Param("deviceId")String deviceId); @@ -36,4 +38,13 @@ public interface EntDeviceInsCycleMapper extends BaseMapper { * @return list * */ int updateDeviceInspectionCycle(@Param("data") EntDeviceInsCycle entDeviceInsCycle); + + + + /** + * 检查周期巡检是否超期 + * @param date 今天的任务 + * @return int + * */ + List checkDeviceInspectionRecord(String date); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMapper.java index d648672..f8609b7 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceMapper.java @@ -44,4 +44,22 @@ public interface EntDeviceMapper extends BaseMapper { * */ int updateEntDevice(@Param("entDevice") EntDevice entDevice); + + + /** + * 企业设备修改 + * @param deviceId 设备id + * @param overdueState 超期状态 + * @return EntDevice + * */ + int updateOverdueInspection(@Param("deviceId") String deviceId,@Param("overdueState")Integer overdueState); + + + /** + * 小程序企业设备过期列表 + * @param enterpriseId 企业id + * @return EntDevice + * */ + List selectEntEquipmentOverdue(String enterpriseId); + } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntInsRecordMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntInsRecordMapper.java index db0098b..56675ad 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntInsRecordMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntInsRecordMapper.java @@ -29,10 +29,11 @@ public interface EntInsRecordMapper extends BaseMapper { /** * 查询巡检记录 + * @param deviceId 设备id * @param inspectionRecordName 巡检记录对象 * @return int * */ - List selectInspectionRecord(@Param("inspectionRecordName") String inspectionRecordName); + List selectInspectionRecord(@Param("deviceId") String deviceId,@Param("inspectionRecordName") String inspectionRecordName); } diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java b/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java index 384d7bb..652623a 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java +++ b/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java @@ -7,6 +7,8 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; 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; @@ -44,22 +46,27 @@ public class EntDevice implements Serializable { @TableField("model_state") private Integer modelState; + @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "购买时间") @TableField("buy_time") private Date buyTime; + @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "出厂日期") @TableField("date_production") private Date dateProduction; + @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "安装时间") @TableField("installation_time") private Date installationTime; + @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "启用时间") @TableField("enable_time") private Date enableTime; + @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "报废时间") @TableField("scrap_time") private Date scrapTime; @@ -124,6 +131,77 @@ public class EntDevice implements Serializable { @TableField("specific_location") private String specificLocation; + @ApiModelProperty(value = "保养数") + @TableField(exist = false) + private Integer entDeviceMaintenanceRecord; + + @ApiModelProperty(value = "巡检数") + @TableField(exist = false) + private Integer entInsRecord; + + @ApiModelProperty(value = "维修数") + @TableField(exist = false) + private Integer entRepairRecord; + + @ApiModelProperty(value = "送检数") + @TableField(exist = false) + private Integer entInspectionRecord; + + @ApiModelProperty(value = "需要巡检总频次") + @TableField(exist = false) + private Integer frequency; + + @ApiModelProperty(value = "巡检次数") + @TableField(exist = false) + private Integer recordNumber; + + public Integer getFrequency() { + return frequency; + } + + public void setFrequency(Integer frequency) { + this.frequency = frequency; + } + + public Integer getRecordNumber() { + return recordNumber; + } + + public void setRecordNumber(Integer recordNumber) { + this.recordNumber = recordNumber; + } + + public Integer getEntDeviceMaintenanceRecord() { + return entDeviceMaintenanceRecord; + } + + public void setEntDeviceMaintenanceRecord(Integer entDeviceMaintenanceRecord) { + this.entDeviceMaintenanceRecord = entDeviceMaintenanceRecord; + } + + public Integer getEntInsRecord() { + return entInsRecord; + } + + public void setEntInsRecord(Integer entInsRecord) { + this.entInsRecord = entInsRecord; + } + + public Integer getEntRepairRecord() { + return entRepairRecord; + } + + public void setEntRepairRecord(Integer entRepairRecord) { + this.entRepairRecord = entRepairRecord; + } + + public Integer getEntInspectionRecord() { + return entInspectionRecord; + } + + public void setEntInspectionRecord(Integer entInspectionRecord) { + this.entInspectionRecord = entInspectionRecord; + } public BigDecimal getLongitude() { return longitude; 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 1ebcf11..626fcf7 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceInsCycle.java +++ b/inventory-dao/src/main/java/com/rzyc/model/EntDeviceInsCycle.java @@ -5,6 +5,8 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; 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; @@ -86,9 +88,22 @@ public class EntDeviceInsCycle implements Serializable { @TableField("modify_time") private Date modifyTime; + @JsonFormat(pattern = "yyyy-MM-dd") @TableField("next_time_inspection") private Date nextTimeInspection; + @JsonFormat(pattern = "yyyy-MM-dd") + @TableField(exist = false) + private Date insRecordDate; + + public Date getInsRecordDate() { + return insRecordDate; + } + + public void setInsRecordDate(Date insRecordDate) { + this.insRecordDate = insRecordDate; + } + public Date getNextTimeInspection() { return nextTimeInspection; } diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceType.java b/inventory-dao/src/main/java/com/rzyc/model/EntDeviceType.java index 89878de..9bf70d5 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceType.java +++ b/inventory-dao/src/main/java/com/rzyc/model/EntDeviceType.java @@ -5,6 +5,8 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; +import java.util.List; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -74,6 +76,18 @@ public class EntDeviceType implements Serializable { @TableField("modify_by") private String modifyBy; + + @TableField(exist = false) + private List children; + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + public String getTypeId() { return typeId; } 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 2aecc19..5f6ef31 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 @@ -15,7 +15,7 @@ public class AddOrUpdateDeviceInspectionCycleDto { @ApiModelProperty("周期巡检id") private String inspectionId; - @ApiModelProperty("企业名") + @ApiModelProperty("企业id") private String enterpriseId; @ApiModelProperty("设备id") @@ -48,6 +48,7 @@ public class AddOrUpdateDeviceInspectionCycleDto { @ApiModelProperty("技术措施") private String technicalMeasures; + @ApiModelProperty("下次巡检日期") @TableField("next_time_inspection") private Date nextTimeInspection; diff --git a/inventory-dao/src/main/resources/mapper/EntDeviceInsCycleMapper.xml b/inventory-dao/src/main/resources/mapper/EntDeviceInsCycleMapper.xml index c5e3634..b5a6378 100644 --- a/inventory-dao/src/main/resources/mapper/EntDeviceInsCycleMapper.xml +++ b/inventory-dao/src/main/resources/mapper/EntDeviceInsCycleMapper.xml @@ -21,6 +21,7 @@ + @@ -29,7 +30,7 @@ + select edic.*,eir.ins_record_date from ent_device_ins_cycle edic + left join + (select * from ent_ins_record order by create_time desc limit 1)as eir on edic.inspection_id = eir.cycle_id + where edic.next_time_inspection = #{date} + + + + diff --git a/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml b/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml index 5e5753a..9e901e2 100644 --- a/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml +++ b/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml @@ -30,13 +30,48 @@ - + select ed.*,cycle.frequency,cycle.recordNumber from ent_device ed + left join (select edic.frequency,count(eir.ins_record_id)as recordNumber from ent_device_ins_cycle edic ed on ed.device_id = edic.device_id + left join ent_ins_record eir on edic.inspection_id = eir.cycle_id order by create_time desc limit 1)as cycle + where ed.enterprise_id = #{enterpriseId} and overdue_inspection = 2 + + + + + + + + + + + + - select * from ent_ins_record where 1=1 + select * from ent_ins_record where device_id = #{deviceId} and ins_record_situation like concat('%',#{inspectionRecordName},'%') diff --git a/inventory-ent/src/main/java/com/rzyc/advice/SaticScheduleTask.java b/inventory-ent/src/main/java/com/rzyc/advice/SaticScheduleTask.java index aa05d4d..5bf9632 100644 --- a/inventory-ent/src/main/java/com/rzyc/advice/SaticScheduleTask.java +++ b/inventory-ent/src/main/java/com/rzyc/advice/SaticScheduleTask.java @@ -16,13 +16,17 @@ public class SaticScheduleTask { @Scheduled(cron = "0 01 02 * * ?") - //或直接指定时间间隔，例如：5秒 -// @Scheduled(fixedRate=600000) private void configureTasks() { taskService.task(); + } + + @Scheduled(cron = "0 */4 * * * ?") + private void deviceInspectionCycleCheck() { + taskService.deviceInspectionCycleCheck(); } + } diff --git a/inventory-ent/src/main/java/com/rzyc/controller/EmergencyEquipmentController.java b/inventory-ent/src/main/java/com/rzyc/controller/EmergencyEquipmentController.java index c757a11..0f530fa 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/EmergencyEquipmentController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/EmergencyEquipmentController.java @@ -214,7 +214,7 @@ public class EmergencyEquipmentController { @PreAuthorize("hasAnyAuthority('entEmRehearsalList:delete')") @MethodAnnotation(authorizations = {"entEmRehearsalList:delete"},name = "应急演练删除") @ApiImplicitParams({ - @ApiImplicitParam(name = "主键", value = "id",required = true, dataType = "string"), + @ApiImplicitParam(name = "id", value = "主键",required = true, dataType = "string"), }) @ResponseBody public SingleResult entEmRehearsalDelete(@RequestParam("id") String id)throws Exception{ @@ -232,7 +232,7 @@ public class EmergencyEquipmentController { @PreAuthorize("hasAnyAuthority('entEmReservePlanList:delete')") @MethodAnnotation(authorizations = {"entEmReservePlanList:delete"},name = "应急预案删除") @ApiImplicitParams({ - @ApiImplicitParam(name = "主键", value = "id",required = true, dataType = "string"), + @ApiImplicitParam(name = "id", value = "主键",required = true, dataType = "string"), }) @ResponseBody public SingleResult entEmReservePlanDelete(@RequestParam("id") String id)throws Exception{ @@ -249,7 +249,7 @@ public class EmergencyEquipmentController { @PreAuthorize("hasAnyAuthority('entEmExpertList:delete')") @MethodAnnotation(authorizations = {"entEmExpertList:delete"},name = "应急专家删除") @ApiImplicitParams({ - @ApiImplicitParam(name = "主键", value = "id",required = true, dataType = "string"), + @ApiImplicitParam(name = "id", value = "主键",required = true, dataType = "string"), }) @ResponseBody public SingleResult entEmExpertDelete(@RequestParam("id") String id)throws Exception{ @@ -267,7 +267,7 @@ public class EmergencyEquipmentController { @PreAuthorize("hasAnyAuthority('entEmEquipmentList:delete')") @MethodAnnotation(authorizations = {"entEmEquipmentList:delete"},name = "应急资源删除") @ApiImplicitParams({ - @ApiImplicitParam(name = "主键", value = "id",required = true, dataType = "string"), + @ApiImplicitParam(name = "id", value = "主键",required = true, dataType = "string"), }) @ResponseBody public SingleResult entEmEquipmentDelete(@RequestParam("id") String id)throws Exception{ @@ -276,4 +276,5 @@ public class EmergencyEquipmentController { + } 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 3117695..7001f22 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/EnterpriseEquipmentController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/EnterpriseEquipmentController.java @@ -79,6 +79,25 @@ public class EnterpriseEquipmentController extends BaseController { } + /** + * 企业设备详细 + * @param deviceId 设备id + * @return 企业设备 + * @throws Exception + */ + @ApiOperation(value = "企业设备详细", notes = "企业设备详细") + @ApiImplicitParams({ + @ApiImplicitParam(name = "deviceId", value = "设备id", required = true, dataType = "string"), + }) + @GetMapping(value = "/deviceDetail") + @PreAuthorize("hasAnyAuthority('entEquipmentList')") + @MethodAnnotation(authorizations = {"entEquipmentList"},name = "企业设备详细") + @ResponseBody + public SingleResult deviceDetail(@RequestParam(required = true) String deviceId)throws Exception{ + return pcBusinessService.deviceDetail(deviceId); + } + + /** * 企业设备保养和维修检查记录统计 * @param enterpriseId 企业id @@ -95,7 +114,7 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('entEquipmentStatistic')") @MethodAnnotation(authorizations = {"entEquipmentStatistic"},name = "企业设备保养和维修检查记录统计") @ResponseBody - public SingleResult> entEquipmentStatistic(@RequestParam(required = true) String enterpriseId, String deviceId)throws Exception{ + public SingleResult entEquipmentStatistic(@RequestParam(required = true) String enterpriseId, String deviceId)throws Exception{ return pcBusinessService.entEquipmentStatistic(enterpriseId,deviceId); } @@ -137,11 +156,12 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('deviceInspectionCycle','deviceInspectionCycle:update')") @MethodAnnotation(authorizations = {"deviceInspectionCycle","deviceInspectionCycle:update"},name = "设备维护周期") @ApiImplicitParams({ - @ApiImplicitParam(name = "inspectionName", value = "巡检名", required = false, dataType = "string") + @ApiImplicitParam(name = "inspectionName", value = "巡检名", required = false, dataType = "string"), + @ApiImplicitParam(name = "deviceId", value = "设备id", required = false, dataType = "string") }) @ResponseBody - public SingleResult> deviceInspectionCycle(String inspectionName,Integer page,Integer pageSize)throws Exception{ - return pcBusinessService.deviceInspectionCycle(inspectionName,page,pageSize); + public SingleResult> deviceInspectionCycle(String inspectionName,String deviceId,Integer page,Integer pageSize)throws Exception{ + return pcBusinessService.deviceInspectionCycle(inspectionName,deviceId,page,pageSize); } @@ -183,8 +203,8 @@ public class EnterpriseEquipmentController extends BaseController { @PreAuthorize("hasAnyAuthority('insRecord','insRecord:update')") @MethodAnnotation(authorizations = {"insRecord","insRecord:update"},name = "设备巡检记录") @ResponseBody - public SingleResult> inspectionRecord(String inspectionRecordName,Integer page,Integer pageSize)throws Exception{ - return pcBusinessService.selectInsRecord(inspectionRecordName,page,pageSize); + public SingleResult> insRecord(String deviceId,String inspectionRecordName,Integer page,Integer pageSize)throws Exception{ + return pcBusinessService.selectInsRecord(deviceId,inspectionRecordName,page,pageSize); } @@ -388,7 +408,7 @@ public class EnterpriseEquipmentController extends BaseController { /** * 设备安标 - * + * @throws Exception * */ @@ -407,7 +427,7 @@ public class EnterpriseEquipmentController extends BaseController { /** * 新增,修改操作规程 - * + * @throws Exception * */ @ApiOperation(value = "新增,修改操作规程", notes = "新增,修改操作规程") @PostMapping(value = "/operatingInstructionsAddOrUpdate") @@ -419,5 +439,29 @@ public class EnterpriseEquipmentController extends BaseController { } + /** + * 企业设备过期列表 + * @return Data + * @throws Exception + */ + @ApiOperation(value = "企业设备过期列表", notes = "企业设备过期列表") + @GetMapping(value = "/entDeviceOverdue") + @PreAuthorize("hasAnyAuthority('entDeviceOverdue')") + @MethodAnnotation(authorizations = {"entDeviceOverdue"},name = "应急资源删除") + @ApiImplicitParams({ + @ApiImplicitParam(name = "enterpriseId", value = "企业id",required = true, dataType = "string"), + }) + @ResponseBody + public SingleResult selectEntEquipmentOverdue(@RequestParam("enterpriseId") String enterpriseId)throws Exception{ + return pcBusinessService.selectEntEquipmentOverdue(enterpriseId); + } + + + + + + + + } diff --git a/inventory-ent/src/main/java/com/rzyc/service/DeviceInspectionCycle.java b/inventory-ent/src/main/java/com/rzyc/service/DeviceInspectionCycle.java new file mode 100644 index 0000000..6845fe5 --- /dev/null +++ b/inventory-ent/src/main/java/com/rzyc/service/DeviceInspectionCycle.java @@ -0,0 +1,43 @@ +package com.rzyc.service; + +import com.rzyc.mapper.EntDeviceInsCycleMapper; +import com.rzyc.mapper.EntDeviceMapper; +import com.rzyc.model.EntDeviceInsCycle; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.List; +/** + * @author Xuwanxin + * @date 2022/11/16 + * */ +public class DeviceInspectionCycle implements Runnable{ + + private EntDeviceInsCycleMapper entDeviceInsCycleMapper; + + private EntDeviceMapper entDeviceMapper; + + public DeviceInspectionCycle(EntDeviceInsCycleMapper entDeviceInsCycleMapper, EntDeviceMapper entDeviceMapper) { + this.entDeviceInsCycleMapper = entDeviceInsCycleMapper; + this.entDeviceMapper = entDeviceMapper; + } + + @Override + public void run() { + DateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd"); + Calendar calendar=Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY,-24); + String yesterdayDate=dateFormat.format(calendar.getTime()); + List list = entDeviceInsCycleMapper.checkDeviceInspectionRecord(yesterdayDate); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + for (EntDeviceInsCycle e:list) { + String date1 = simpleDateFormat.format(e.getNextTimeInspection()); + String date2 = simpleDateFormat.format(e.getInsRecordDate()); + if (!date1.equals(date2)){ + //2为超期 + entDeviceMapper.updateOverdueInspection(e.getDeviceId(),2); + } + } + } +} 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 43112c1..59907b6 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java +++ b/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java @@ -321,6 +321,7 @@ public class PcBusinessService extends BaseController { entPostMap.put("typeId",entDeviceType.getTypeId()); entPostMap.put("name",entDeviceType.getName()); entPostMap.put("parentId",entDeviceType.getParentId()); + entPostMap.put("parentPath",entDeviceType.getParentPath()); entPostMap.put("logo",entDeviceType.getLogo()); data.add(entPostMap); } @@ -336,6 +337,13 @@ public class PcBusinessService extends BaseController { return singleResult; } + public SingleResult deviceDetail(String deviceId){ + SingleResult singleResult = new SingleResult(); + EntDevice entDevice = entDeviceMapper.selectById(deviceId); + singleResult.setData(entDevice); + return singleResult; + } + public SingleResult entEquipmentStatistic(String enterpriseId, String deviceId){ SingleResult singleResult = new SingleResult(); EntDevice data = entDeviceMapper.entEquipmentStatistic(enterpriseId,deviceId); @@ -428,9 +436,9 @@ public class PcBusinessService extends BaseController { } @PageOperation - public SingleResult deviceInspectionCycle(String inspectionName,Integer page,Integer pageSize){ + public SingleResult deviceInspectionCycle(String inspectionName,String deviceId,Integer page,Integer pageSize){ SingleResult singleResult = new SingleResult(); - Pagelist = (Page) entDeviceInsCycleMapper.deviceInspectionCycle(inspectionName); + Pagelist = (Page) entDeviceInsCycleMapper.deviceInspectionCycle(inspectionName,deviceId); singleResult.setDataPager(list); return singleResult; } @@ -473,9 +481,9 @@ public class PcBusinessService extends BaseController { @PageOperation - public SingleResult selectInsRecord(String inspectionRecordName,Integer page,Integer pageSize){ + public SingleResult selectInsRecord(String deviceId,String inspectionRecordName,Integer page,Integer pageSize){ SingleResult singleResult = new SingleResult(); - Page entInsRecords = (Page) entInsRecordMapper.selectInspectionRecord(inspectionRecordName); + Page entInsRecords = (Page) entInsRecordMapper.selectInspectionRecord(deviceId,inspectionRecordName); singleResult.setDataPager(entInsRecords); return singleResult; } @@ -918,7 +926,12 @@ public class PcBusinessService extends BaseController { return date; } - + public SingleResult selectEntEquipmentOverdue(String enterpriseId){ + SingleResult singleResult = new SingleResult(); + Listdevices = entDeviceMapper.selectEntEquipmentOverdue(enterpriseId); + singleResult.setData(devices); + return singleResult; + } diff --git a/inventory-ent/src/main/java/com/rzyc/service/TaskService.java b/inventory-ent/src/main/java/com/rzyc/service/TaskService.java index 6660d3c..a48372f 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/TaskService.java +++ b/inventory-ent/src/main/java/com/rzyc/service/TaskService.java @@ -3,6 +3,7 @@ package com.rzyc.service; import com.common.utils.DateUtils; import com.common.utils.RandomNumber; import com.common.utils.encryption.MD5; +import com.common.utils.model.SingleResult; import com.rzyc.bean.check.CheckPerform; import com.rzyc.controller.BaseController; import com.rzyc.model.*; @@ -10,8 +11,11 @@ import com.rzyc.model.check.BookEntHT; import com.rzyc.model.check.BookenthtCompany; import com.rzyc.model.ent.SysEnterprise; import com.rzyc.model.user.SysUser; +import org.junit.Test; import org.springframework.stereotype.Service; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -180,10 +184,18 @@ public class TaskService extends BaseController { }catch (Exception e){ e.printStackTrace(); } - - } + + public void deviceInspectionCycleCheck(){ + new DeviceInspectionCycle(entDeviceInsCycleMapper,entDeviceMapper).run(); + } + + + + + + public static void main(String[] args) { try { System.out.println(MD5.md5("170929")); diff --git a/inventory-ent/src/main/java/com/rzyc/utils/StringEncryptorTest.java b/inventory-ent/src/main/java/com/rzyc/utils/StringEncryptorTest.java index 2216e4d..71936c8 100644 --- a/inventory-ent/src/main/java/com/rzyc/utils/StringEncryptorTest.java +++ b/inventory-ent/src/main/java/com/rzyc/utils/StringEncryptorTest.java @@ -2,10 +2,17 @@ package com.rzyc.utils; +import com.rzyc.controller.BaseController; +import com.rzyc.model.EntDeviceInsCycle; import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; import org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig; import org.junit.Test; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.List; + /** * 配置类脱敏加密工具 @@ -13,7 +20,9 @@ import org.junit.Test; * @date 2022/10/13 * */ -public class StringEncryptorTest { +public class StringEncryptorTest extends BaseController { + + @Test public void test(){