diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java index deb3398..13f57ab 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java @@ -89,9 +89,9 @@ public class OperatingController extends BaseController { @RequestMapping(value = "/getGPSInstallation", method = RequestMethod.POST) @ApiOperation(value = "作业环境-GPS安装检测设备查询") - public AjaxResult getGPSInstallation(@RequestBody OperatingQualityDto dto) { + public AjaxResult getGisInstallation(@RequestBody OperatingQualityDto dto) { try { - List list = service.getGPSInstallation(dto); + List list = service.getGisInstallation(dto); return AjaxResult.success(list); } catch (Exception e) { return AjaxResult.error(); @@ -100,9 +100,9 @@ public class OperatingController extends BaseController { @RequestMapping(value = "/GPSInstallationEnvironment", method = RequestMethod.POST) @ApiOperation(value = "作业环境-GPS安装检测环境查询") - public AjaxResult getGPSInstallationEnvironment(@RequestBody OperatingQualityDto dto) { + public AjaxResult getGisInstallationEnvironment(@RequestBody OperatingQualityDto dto) { try { - List list = service.getGPSInstallationEnvironment(dto); + List list = service.getGisInstallationEnvironment(dto); return AjaxResult.success(list); } catch (Exception e) { return AjaxResult.error(); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ConstructionQualityMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ConstructionQualityMapper.java index 55c9236..ca7c8d9 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ConstructionQualityMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ConstructionQualityMapper.java @@ -9,6 +9,14 @@ import java.util.List; @Repository(value = "ConstructionQualityMapper") public interface ConstructionQualityMapper { + /** + * 施工质量-检测记录对比 + * @param o + * @return List + * @description + * @author jjLv + * @date 2024/3/27 19:54 + */ List getByMonth(ConstructionQualityDto o); /** @@ -21,7 +29,23 @@ public interface ConstructionQualityMapper { */ List getConstructionAlarm(ConstructionQualityDto dto); + /** + * 施工质量-质量检测设备 + * @param dto + * @return List + * @description + * @author jjLv + * @date 2024/3/27 19:54 + */ List getQualityInspection(ConstructionQualityDto dto); + /** + * 施工质量-施工质量列表 + * @param dto + * @return List + * @description + * @author jjLv + * @date 2024/3/27 19:54 + */ List getConstructionQualityList(ConstructionQualityDto dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/OperatingMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/OperatingMapper.java index 7b83670..4181ad3 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/OperatingMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/OperatingMapper.java @@ -13,6 +13,7 @@ public interface OperatingMapper { /** * 作业环境-实时检测 + * @param dto * @return List * @description * @author jjLv @@ -48,7 +49,7 @@ public interface OperatingMapper { * @author jjLv * @date 2024/3/27 19:54 */ - List getGPSInstallation(OperatingQualityDto dto); + List getGisInstallation(OperatingQualityDto dto); /** * 作业环境-有限空间检测环境 @@ -68,7 +69,7 @@ public interface OperatingMapper { * @author jjLv * @date 2024/3/27 19:54 */ - List getGPSInstallationEnvironment(OperatingQualityDto dto); + List getGisInstallationEnvironment(OperatingQualityDto dto); /** * 作业环境-边坡位移监测列表 diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/PersonnelControlMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/PersonnelControlMapper.java index d6f5993..0f3c099 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/PersonnelControlMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/PersonnelControlMapper.java @@ -14,7 +14,7 @@ public interface PersonnelControlMapper { /** * 人员管控-穿戴装备 - * + * @param dto * @return AjaxResult * @description * @author jjLV diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/ConstructionQualityService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/ConstructionQualityService.java index 4ff2aed..e076eb2 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/ConstructionQualityService.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/ConstructionQualityService.java @@ -7,12 +7,44 @@ import java.util.List; public interface ConstructionQualityService { + /** + * 施工质量-检测记录对比 + * @param dto + * @return List + * @description + * @author jjLv + * @date 2024/3/27 19:54 + */ List getDetectionRecord(ConstructionQualityDto dto); + /** + * 施工质量-告警内容 + * @param dto + * @return List + * @description + * @author jjLv + * @date 2024/3/27 19:54 + */ List getConstructionAlarm(ConstructionQualityDto dto); + /** + * 施工质量-质量检测设备 + * @param dto + * @return List + * @description + * @author jjLv + * @date 2024/3/27 19:54 + */ List getQualityInspection(ConstructionQualityDto dto); + /** + * 施工质量-施工质量列表 + * @param dto + * @return List + * @description + * @author jjLv + * @date 2024/3/27 19:54 + */ List getConstructionQualityList(ConstructionQualityDto dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/OperatingService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/OperatingService.java index bf59ecc..d8d0d0f 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/OperatingService.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/OperatingService.java @@ -50,7 +50,7 @@ public interface OperatingService { * @author jjLv * @date 2024/3/27 19:54 */ - List getGPSInstallation(OperatingQualityDto dto); + List getGisInstallation(OperatingQualityDto dto); /** * 作业环境-有限空间检测环境 @@ -70,7 +70,7 @@ public interface OperatingService { * @author jjLv * @date 2024/3/27 19:54 */ - List getGPSInstallationEnvironment(OperatingQualityDto dto); + List getGisInstallationEnvironment(OperatingQualityDto dto); /** * 作业环境-边坡位移监测列表 diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java index aa524a5..84d9716 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java @@ -20,7 +20,14 @@ public class ConstructionQualityImpl implements ConstructionQualityService { @Resource(name = "ConstructionQualityMapper") private ConstructionQualityMapper mapper; - + /** + * 施工质量-告警内容 + * @param dto + * @return List + * @description + * @author jjLv + * @date 2024/3/27 19:54 + */ @Override public List getConstructionAlarm(ConstructionQualityDto dto) { List list = new ArrayList<>(); @@ -32,11 +39,27 @@ public class ConstructionQualityImpl implements ConstructionQualityService { return list; } + /** + * 施工质量-质量检测设备 + * @param dto + * @return List + * @description + * @author jjLv + * @date 2024/3/27 19:54 + */ @Override public List getQualityInspection(ConstructionQualityDto dto) { return mapper.getQualityInspection(dto); } + /** + * 施工质量-施工质量列表 + * @param dto + * @return List + * @description + * @author jjLv + * @date 2024/3/27 19:54 + */ @Override public List getConstructionQualityList(ConstructionQualityDto dto) { List list = new ArrayList<>(); @@ -48,11 +71,20 @@ public class ConstructionQualityImpl implements ConstructionQualityService { return list; } + /** + * 施工质量-检测记录对比 + * @param dto + * @return List + * @description + * @author jjLv + * @date 2024/3/27 19:54 + */ @Override public List getDetectionRecord(ConstructionQualityDto dto) { + final int NUM_MONTHS_IN_YEAR = 12; YearMonth currentYearMonth = YearMonth.now(); YearMonth[] lastTwelveMonths = new YearMonth[12]; - for (int i = 0; i < 12; i++) { + for (int i = 0; i < NUM_MONTHS_IN_YEAR; i++) { lastTwelveMonths[i] = currentYearMonth.minusMonths(11 - i); } List list = new ArrayList<>(); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OperatingImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OperatingImpl.java index 1265179..8f27a4d 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OperatingImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OperatingImpl.java @@ -75,8 +75,8 @@ public class OperatingImpl implements OperatingService { * @date 2024/3/27 19:54 */ @Override - public List getGPSInstallation(OperatingQualityDto dto) { - return mapper.getGPSInstallation(dto); + public List getGisInstallation(OperatingQualityDto dto) { + return mapper.getGisInstallation(dto); } /** @@ -101,8 +101,8 @@ public class OperatingImpl implements OperatingService { * @date 2024/3/27 19:54 */ @Override - public List getGPSInstallationEnvironment(OperatingQualityDto dto) { - return mapper.getGPSInstallationEnvironment(dto); + public List getGisInstallationEnvironment(OperatingQualityDto dto) { + return mapper.getGisInstallationEnvironment(dto); } /** diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/PersonnelControlImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/PersonnelControlImpl.java index 9001301..c8806ef 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/PersonnelControlImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/PersonnelControlImpl.java @@ -77,8 +77,8 @@ public class PersonnelControlImpl implements PersonnelControlService { */ @Override public int addNewFence(PersonnelControlDto dto) { - String UUID = IdUtils.getUUId(); - dto.setUUID(UUID); + String uuId = IdUtils.getUUId(); + dto.setUUID(uuId); int result = mapper.addNewFence(dto); int insertResult = 0; if (result > 0) { diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml index 84955df..918190a 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml @@ -44,7 +44,7 @@ - SELECT tbd.device_id AS id, tbd.device_name AS deviceName, @@ -73,7 +73,7 @@ -