diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/PersonnelControlDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/PersonnelControlDto.java index bd463ad..cef065d 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/PersonnelControlDto.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/PersonnelControlDto.java @@ -41,7 +41,7 @@ public class PersonnelControlDto extends ScreenParamDto { private String arrayField; @ApiModelProperty(value = "围栏id") - private String UUID; + private String uuId; @ApiModelProperty(value = "经度") private String longitude; diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/PersonnelControlController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/PersonnelControlController.java index 641fe4a..50d3251 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/PersonnelControlController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/PersonnelControlController.java @@ -131,9 +131,9 @@ public class PersonnelControlController extends BaseController { @RequestMapping(value = "/PersonnelHistoricalCoordinates", method = RequestMethod.POST) @ApiOperation(value = "人员管控-人员坐标点") - public AjaxResult PersonnelHistoricalCoordinates(@RequestBody PersonnelControlDto dto) { + public AjaxResult personnelHistoricalCoordinates(@RequestBody PersonnelControlDto dto) { try { - List list = service.PersonnelHistoricalCoordinates(dto); + List list = service.personnelHistoricalCoordinates(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 ca7c8d9..d34fbbc 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 @@ -6,6 +6,9 @@ import org.springframework.stereotype.Repository; import java.util.List; +/** + * @author Lenovo + */ @Repository(value = "ConstructionQualityMapper") public interface ConstructionQualityMapper { 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 4181ad3..1c46883 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 @@ -8,6 +8,9 @@ import org.springframework.stereotype.Repository; import java.util.List; +/** + * @author Lenovo + */ @Repository(value = "OperatingMapper") public interface OperatingMapper { 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 0f3c099..69183c3 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 @@ -131,5 +131,5 @@ public interface PersonnelControlMapper { * @author jjLV * @date 2024/3/27 17:23 */ - List PersonnelHistoricalCoordinates(PersonnelControlDto dto); + List personnelHistoricalCoordinates(PersonnelControlDto dto); } 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 e076eb2..84651a4 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 @@ -4,7 +4,9 @@ import com.securitycontrol.entity.screen.dto.ConstructionQualityDto; import com.securitycontrol.entity.screen.vo.ConstructionQualityVo; import java.util.List; - +/** + * @author Lenovo + */ public interface ConstructionQualityService { /** diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/PersonnelControlService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/PersonnelControlService.java index 111fc20..94eaab5 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/PersonnelControlService.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/PersonnelControlService.java @@ -121,5 +121,5 @@ public interface PersonnelControlService { * @author jjLV * @date 2024/3/27 17:23 */ - List PersonnelHistoricalCoordinates(PersonnelControlDto dto); + List personnelHistoricalCoordinates(PersonnelControlDto 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 84d9716..10ec20b 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 @@ -13,6 +13,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +/** + * @author Lenovo + */ @Slf4j @Service(value = "ConstructionQualityService") public class ConstructionQualityImpl implements ConstructionQualityService { 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 c8806ef..77ac1fa 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 @@ -78,7 +78,7 @@ public class PersonnelControlImpl implements PersonnelControlService { @Override public int addNewFence(PersonnelControlDto dto) { String uuId = IdUtils.getUUId(); - dto.setUUID(uuId); + dto.setUuId(uuId); int result = mapper.addNewFence(dto); int insertResult = 0; if (result > 0) { @@ -187,7 +187,7 @@ public class PersonnelControlImpl implements PersonnelControlService { * @date 2024/3/27 17:23 */ @Override - public List PersonnelHistoricalCoordinates(PersonnelControlDto dto) { - return mapper.PersonnelHistoricalCoordinates(dto); + public List personnelHistoricalCoordinates(PersonnelControlDto dto) { + return mapper.personnelHistoricalCoordinates(dto); } } \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml index 06f6c54..30c2ac5 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml @@ -5,13 +5,13 @@ INSERT INTO tb_pro_fence (id, fence_name, fence_type, bid_code, create_time, update_time, alarm_type, alert_ype, color) VALUES - (#{UUID}, #{fencingName}, #{fencingType}, #{bidCode}, NOW(), NOW(), #{alarmType}, #{alertType}, #{color}) + (#{uuId}, #{fencingName}, #{fencingType}, #{bidCode}, NOW(), NOW(), #{alarmType}, #{alertType}, #{color}) INSERT INTO tb_fence_detail (id, fence_id, lat, lon, create_time) VALUES - (UUID(), #{UUID}, #{latitude}, #{longitude}, NOW()) + (UUID(), #{uuId}, #{latitude}, #{longitude}, NOW()) UPDATE tb_pro_fence @@ -128,7 +128,7 @@ tbd.device_id -