haozq
/
ah_jjzhgd_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码规范修改

This commit is contained in:
jjLv 2024-04-09 16:38:46 +08:00
parent 1fa52a68b2
commit 1c8ad19813
10 changed files with 108 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java
View File

@ -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<OperatingQualityVo> list = service.getGPSInstallation(dto);
List<OperatingQualityVo> 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<OperatingQualityVo> list = service.getGPSInstallationEnvironment(dto);
List<OperatingQualityVo> list = service.getGisInstallationEnvironment(dto);
return AjaxResult.success(list);
} catch (Exception e) {
return AjaxResult.error();

24
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ConstructionQualityMapper.java
View File

@ -9,6 +9,14 @@ import java.util.List;
@Repository(value = "ConstructionQualityMapper")
public interface ConstructionQualityMapper {
/**
* 施工质量-检测记录对比
* @param o
* @return List<OperatingQualityVo>
* &#064;description
* @author jjLv
* @date 2024/3/27 19:54
*/
List<ConstructionQualityVo> getByMonth(ConstructionQualityDto o);
/**
@ -21,7 +29,23 @@ public interface ConstructionQualityMapper {
*/
List<ConstructionQualityVo> getConstructionAlarm(ConstructionQualityDto dto);
/**
* 施工质量-质量检测设备
* @param dto
* @return List<OperatingQualityVo>
* &#064;description
* @author jjLv
* @date 2024/3/27 19:54
*/
List<ConstructionQualityVo> getQualityInspection(ConstructionQualityDto dto);
/**
* 施工质量-施工质量列表
* @param dto
* @return List<OperatingQualityVo>
* &#064;description
* @author jjLv
* @date 2024/3/27 19:54
*/
List<ConstructionQualityVo> getConstructionQualityList(ConstructionQualityDto dto);
}

5
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/OperatingMapper.java
View File

@ -13,6 +13,7 @@ public interface OperatingMapper {
/**
* 作业环境-实时检测
* @param dto
* @return List<OperatingQualityVo>
* @description
* @author jjLv
@ -48,7 +49,7 @@ public interface OperatingMapper {
* @author jjLv
* @date 2024/3/27 19:54
*/
List<OperatingQualityVo> getGPSInstallation(OperatingQualityDto dto);
List<OperatingQualityVo> getGisInstallation(OperatingQualityDto dto);
/**
* 作业环境-有限空间检测环境
@ -68,7 +69,7 @@ public interface OperatingMapper {
* @author jjLv
* @date 2024/3/27 19:54
*/
List<OperatingQualityVo> getGPSInstallationEnvironment(OperatingQualityDto dto);
List<OperatingQualityVo> getGisInstallationEnvironment(OperatingQualityDto dto);
/**
* 作业环境-边坡位移监测列表

2
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/PersonnelControlMapper.java
View File

@ -14,7 +14,7 @@ public interface PersonnelControlMapper {
/**
* 人员管控-穿戴装备
*
* @param dto
* @return AjaxResult
* &#064;description
* @author jjLV

32
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/ConstructionQualityService.java
View File

@ -7,12 +7,44 @@ import java.util.List;
public interface ConstructionQualityService {
/**
* 施工质量-检测记录对比
* @param dto
* @return List<OperatingQualityVo>
* &#064;description
* @author jjLv
* @date 2024/3/27 19:54
*/
List<ConstructionQualityVo> getDetectionRecord(ConstructionQualityDto dto);
/**
* 施工质量-告警内容
* @param dto
* @return List<OperatingQualityVo>
* &#064;description
* @author jjLv
* @date 2024/3/27 19:54
*/
List<ConstructionQualityVo> getConstructionAlarm(ConstructionQualityDto dto);
/**
* 施工质量-质量检测设备
* @param dto
* @return List<OperatingQualityVo>
* &#064;description
* @author jjLv
* @date 2024/3/27 19:54
*/
List<ConstructionQualityVo> getQualityInspection(ConstructionQualityDto dto);
/**
* 施工质量-施工质量列表
* @param dto
* @return List<OperatingQualityVo>
* &#064;description
* @author jjLv
* @date 2024/3/27 19:54
*/
List<ConstructionQualityVo> getConstructionQualityList(ConstructionQualityDto dto);
}

4
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/OperatingService.java
View File

@ -50,7 +50,7 @@ public interface OperatingService {
* @author jjLv
* @date 2024/3/27 19:54
*/
List<OperatingQualityVo> getGPSInstallation(OperatingQualityDto dto);
List<OperatingQualityVo> getGisInstallation(OperatingQualityDto dto);
/**
* 作业环境-有限空间检测环境
@ -70,7 +70,7 @@ public interface OperatingService {
* @author jjLv
* @date 2024/3/27 19:54
*/
List<OperatingQualityVo> getGPSInstallationEnvironment(OperatingQualityDto dto);
List<OperatingQualityVo> getGisInstallationEnvironment(OperatingQualityDto dto);
/**
* 作业环境-边坡位移监测列表

36
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java
View File

@ -20,7 +20,14 @@ public class ConstructionQualityImpl implements ConstructionQualityService {
@Resource(name = "ConstructionQualityMapper")
private ConstructionQualityMapper mapper;
/**
* 施工质量-告警内容
* @param dto
* @return List<OperatingQualityVo>
* &#064;description
* @author jjLv
* @date 2024/3/27 19:54
*/
@Override
public List<ConstructionQualityVo> getConstructionAlarm(ConstructionQualityDto dto) {
List<ConstructionQualityVo> list = new ArrayList<>();
@ -32,11 +39,27 @@ public class ConstructionQualityImpl implements ConstructionQualityService {
return list;
}
/**
* 施工质量-质量检测设备
* @param dto
* @return List<OperatingQualityVo>
* &#064;description
* @author jjLv
* @date 2024/3/27 19:54
*/
@Override
public List<ConstructionQualityVo> getQualityInspection(ConstructionQualityDto dto) {
return mapper.getQualityInspection(dto);
}
/**
* 施工质量-施工质量列表
* @param dto
* @return List<OperatingQualityVo>
* &#064;description
* @author jjLv
* @date 2024/3/27 19:54
*/
@Override
public List<ConstructionQualityVo> getConstructionQualityList(ConstructionQualityDto dto) {
List<ConstructionQualityVo> list = new ArrayList<>();
@ -48,11 +71,20 @@ public class ConstructionQualityImpl implements ConstructionQualityService {
return list;
}
/**
* 施工质量-检测记录对比
* @param dto
* @return List<OperatingQualityVo>
* &#064;description
* @author jjLv
* @date 2024/3/27 19:54
*/
@Override
public List<ConstructionQualityVo> 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<ConstructionQualityVo> list = new ArrayList<>();

8
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OperatingImpl.java
View File

@ -75,8 +75,8 @@ public class OperatingImpl implements OperatingService {
* @date 2024/3/27 19:54
*/
@Override
public List<OperatingQualityVo> getGPSInstallation(OperatingQualityDto dto) {
return mapper.getGPSInstallation(dto);
public List<OperatingQualityVo> 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<OperatingQualityVo> getGPSInstallationEnvironment(OperatingQualityDto dto) {
return mapper.getGPSInstallationEnvironment(dto);
public List<OperatingQualityVo> getGisInstallationEnvironment(OperatingQualityDto dto) {
return mapper.getGisInstallationEnvironment(dto);
}
/**

4
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/PersonnelControlImpl.java
View File

@ -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) {

4
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml
View File

@ -44,7 +44,7 @@
</select>
<!--作业环境-GPS安装检测-->
<select id="getGPSInstallation" resultType="com.securitycontrol.entity.screen.vo.OperatingQualityVo">
<select id="getGisInstallation" resultType="com.securitycontrol.entity.screen.vo.OperatingQualityVo">
SELECT
tbd.device_id AS id,
tbd.device_name AS deviceName,
@ -73,7 +73,7 @@
</select>
<!--作业环境-GPS安装检测设备查询-->
<select id="getGPSInstallationEnvironment"
<select id="getGisInstallationEnvironment"
resultType="com.securitycontrol.entity.screen.vo.OperatingQualityVo">
SELECT
tdv.val AS val,