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:56:41 +08:00
parent 1c8ad19813
commit 9d695785fd
10 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/PersonnelControlDto.java
View File

@ -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;

4
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/PersonnelControlController.java
View File

@ -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<PersonnelControlVo> list = service.PersonnelHistoricalCoordinates(dto);
List<PersonnelControlVo> list = service.personnelHistoricalCoordinates(dto);
return AjaxResult.success(list);
} catch (Exception e) {
return AjaxResult.error();

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

@ -6,6 +6,9 @@ import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @author Lenovo
*/
@Repository(value = "ConstructionQualityMapper")
public interface ConstructionQualityMapper {

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

@ -8,6 +8,9 @@ import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @author Lenovo
*/
@Repository(value = "OperatingMapper")
public interface OperatingMapper {

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

@ -131,5 +131,5 @@ public interface PersonnelControlMapper {
* @author jjLV
* @date 2024/3/27 17:23
*/
List<PersonnelControlVo> PersonnelHistoricalCoordinates(PersonnelControlDto dto);
List<PersonnelControlVo> personnelHistoricalCoordinates(PersonnelControlDto dto);
}

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

@ -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 {
/**

2
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/PersonnelControlService.java
View File

@ -121,5 +121,5 @@ public interface PersonnelControlService {
* @author jjLV
* @date 2024/3/27 17:23
*/
List<PersonnelControlVo> PersonnelHistoricalCoordinates(PersonnelControlDto dto);
List<PersonnelControlVo> personnelHistoricalCoordinates(PersonnelControlDto dto);
}

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

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

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

@ -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<PersonnelControlVo> PersonnelHistoricalCoordinates(PersonnelControlDto dto) {
return mapper.PersonnelHistoricalCoordinates(dto);
public List<PersonnelControlVo> personnelHistoricalCoordinates(PersonnelControlDto dto) {
return mapper.personnelHistoricalCoordinates(dto);
}
}

6
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml
View File

@ -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>
<insert id="insertCoordinates">
INSERT INTO tb_fence_detail
(id, fence_id, lat, lon, create_time)
VALUES
(UUID(), #{UUID}, #{latitude}, #{longitude}, NOW())
(UUID(), #{uuId}, #{latitude}, #{longitude}, NOW())
</insert>
<update id="subcontractorSwitchListen">
UPDATE tb_pro_fence
@ -128,7 +128,7 @@
tbd.device_id
</select>
<select id="PersonnelHistoricalCoordinates"
<select id="personnelHistoricalCoordinates"
resultType="com.securitycontrol.entity.screen.vo.PersonnelControlVo">
SELECT
his.val as val,