diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdDetailVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdDetailVo.java new file mode 100644 index 0000000..460e4f3 --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdDetailVo.java @@ -0,0 +1,58 @@ +package com.securitycontrol.entity.background.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; + +/** + * @author:cwchen + * @date:2024-04-02-16:54 + * @version:1.0 + * @description:边带设备详情-vo + */ +@Data +public class DeviceBdDetailVo { + + @ApiModelProperty("ID") + private String id; + + @ApiModelProperty("设备id") + @NotBlank(message = "设备ID不能为空", groups = {Query.class}) + @Length(max = 50, message = "设备ID字符长度不能超过50", groups = {Query.class}) + private String deviceId; + + @ApiModelProperty("检测名称") + @NotBlank(message = "检测名称不能为空", groups = {Query.class}) + @Length(max = 50, message = "检测名称字符长度不能超过50", groups = {Query.class}) + private String modeName; + + @ApiModelProperty("最大阈值") + @Length(max = 50, message = "最大阈值字符长度不能超过50", groups = {Query.class}) + @Pattern(regexp = "(([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))",message = "最大阈值为大于0的数字",groups = {SignProVo.Query.class}) + private String maxValueData; + + @ApiModelProperty("最小阈值") + @Length(max = 50, message = "最小阈值长字符度不能超过50", groups = {Query.class}) + @Pattern(regexp = "(([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))",message = "最小阈值为大于0的数字",groups = {SignProVo.Query.class}) + private String minValueData; + + @ApiModelProperty("采集值类型") + @Length(max = 50, message = "采集值类型字符长度不能超过50", groups = {Query.class}) + private String dataType; + + @ApiModelProperty("设备级联编码") + @Length(max = 50, message = "检设备级联编码字符长度不能超过50", groups = {Query.class}) + private String deviceCode; + + @ApiModelProperty("1.新增 2.修改") + private int type; + + /** + * 查询条件限制 + */ + public interface Query { + } +} diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/HumanManageVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/HumanManageVo.java index 87deffa..044197c 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/HumanManageVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/HumanManageVo.java @@ -64,6 +64,12 @@ public class HumanManageVo { @ApiModelProperty(value = "所属工程") private String proName; + @ApiModelProperty(value = "单位名称") + private String deptName; + + @ApiModelProperty(value = "项目部名称") + private String projectDepName; + @JsonInclude(JsonInclude.Include.NON_EMPTY) @ApiModelProperty(value = "删除的文件ID") private String delFiles; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DeviceOfBdController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DeviceOfBdController.java index 3d6d797..fc39cff 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DeviceOfBdController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DeviceOfBdController.java @@ -6,6 +6,7 @@ import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.core.web.page.TableDataInfo; import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; +import com.securitycontrol.entity.background.vo.DeviceBdDetailVo; import com.securitycontrol.entity.background.dto.DeviceBdDto; import com.securitycontrol.entity.background.vo.DeviceBdChildVo; import com.securitycontrol.entity.background.vo.DeviceBdVo; @@ -99,4 +100,41 @@ public class DeviceOfBdController extends BaseController { public AjaxResult delDeviceBdChildById(@RequestBody DeviceBdDto dto) { return service.delDeviceBdChildById(dto); } + + @ApiOperation(value = "获取边带子设备详情列表") + @GetMapping("getDeviceBdChildDetailList") + @Log(title = "设备管理", menu = "设备管理->边带设备管理", grade = OperationType.QUERY_BUSINESS, details = "查询边带子设备详情列表", type = "业务日志") + public TableDataInfo getDeviceBdChildDetailList(DeviceBdDto dto) { + startPage(); + List list = service.getDeviceBdChildDetailList(dto); + return getDataTable(list); + } + + @ApiOperation(value = "新增边带子设备详情数据") + @PostMapping("addDeviceBdChildDetail") + @Log(title = "设备管理", menu = "设备管理->边带设备管理", grade = OperationType.ADD_BUSINESS, details = "新增边带子设备详情数据", type = "业务日志") + public AjaxResult addDeviceBdChildDetail(@RequestBody DeviceBdDetailVo vo) { + return service.addOrUpdateDeviceBdChildDetail(vo); + } + + @ApiOperation(value = "修改边带子设备详情数据") + @PostMapping("editDeviceBdChildDetail") + @Log(title = "设备管理", menu = "设备管理->边带设备管理", grade = OperationType.UPDATE_BUSINESS, details = "修改边带子设备详情数据", type = "业务日志") + public AjaxResult editDeviceBdChildDetail(@RequestBody DeviceBdDetailVo vo) { + return service.addOrUpdateDeviceBdChildDetail(vo); + } + + @ApiOperation(value = "边带子设备详情数据") + @GetMapping("getDeviceBdChildDetailById") + public AjaxResult getDeviceBdChildDetailById(DeviceBdDto dto) { + return service.getDeviceBdChildDetailById(dto); + } + + @ApiOperation(value = "删除边带子设备详情数据") + @PostMapping("delDeviceBdChildDetail") + @Log(title = "设备管理", menu = "设备管理->边带设备管理", grade = OperationType.DELETE_BUSINESS, details = "删除边带子设备详情", type = "业务日志") + public AjaxResult delDeviceBdChildDetail(@RequestBody DeviceBdDto dto) { + return service.delDeviceBdChildDetail(dto); + } + } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IDeviceOfBdMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IDeviceOfBdMapper.java index 753ec24..7a6b293 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IDeviceOfBdMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IDeviceOfBdMapper.java @@ -2,6 +2,7 @@ package com.securitycontrol.background.mapper; import com.securitycontrol.entity.background.dto.DeviceBdDto; import com.securitycontrol.entity.background.vo.DeviceBdChildVo; +import com.securitycontrol.entity.background.vo.DeviceBdDetailVo; import com.securitycontrol.entity.background.vo.DeviceBdVo; import com.securitycontrol.entity.background.vo.ProBdDevVo; import org.springframework.stereotype.Repository; @@ -145,6 +146,7 @@ public interface IDeviceOfBdMapper { /** * 边带是否绑定重复工程 + * * @param vo * @return int * @description @@ -152,4 +154,56 @@ public interface IDeviceOfBdMapper { * @date 2024/3/28 9:57 */ int isRepeatBanding(DeviceBdVo vo); + + /** + * 获取边带子设备详情列表 + * + * @param dto + * @return List + * @description + * @author cwchen + * @date 2024/4/2 17:00 + */ + List getDeviceBdChildDetailList(DeviceBdDto dto); + + /** + * 设备级联编码 是否存在 + * + * @param vo + * @return int + * @description + * @author cwchen + * @date 2024/4/2 17:31 + */ + int isBdDeviceDetailExist(DeviceBdDetailVo vo); + + /** + * 新增/修改边带子设备详情数据 + * + * @param vo + * @description + * @author cwchen + * @date 2024/4/2 17:31 + */ + void addOrUpdateDeviceBdChildDetail(DeviceBdDetailVo vo); + + /** + * 边带子设备详情数据 + * + * @param dto + * @return DeviceBdDetailVo + * @description + * @author cwchen + * @date 2024/4/2 17:39 + */ + DeviceBdDetailVo getDeviceBdChildDetailById(DeviceBdDto dto); + + /** + * 删除边带子设备详情数据 + * @param dto + * @description + * @author cwchen + * @date 2024/4/2 17:40 + */ + void delDeviceBdChildDetail(DeviceBdDto dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IDeviceOfBdService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IDeviceOfBdService.java index 3b71b33..a6f0b63 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IDeviceOfBdService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IDeviceOfBdService.java @@ -2,6 +2,7 @@ package com.securitycontrol.background.service; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.background.vo.DeviceBdDetailVo; import com.securitycontrol.entity.background.dto.DeviceBdDto; import com.securitycontrol.entity.background.vo.DeviceBdChildVo; import com.securitycontrol.entity.background.vo.DeviceBdVo; @@ -94,6 +95,7 @@ public interface IDeviceOfBdService { /** * 删除边带设备 + * * @param dto * @return AjaxResult * @description @@ -101,4 +103,47 @@ public interface IDeviceOfBdService { * @date 2024/3/20 19:50 */ AjaxResult delDeviceBdChildById(DeviceBdDto dto); + + /** + * 获取边带子设备详情列表 + * + * @param dto + * @return List + * @description + * @author cwchen + * @date 2024/4/2 16:59 + */ + List getDeviceBdChildDetailList(DeviceBdDto dto); + + /** + * 新增/修改边带子设备详情数据 + * + * @param vo + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/4/2 17:24 + */ + AjaxResult addOrUpdateDeviceBdChildDetail(DeviceBdDetailVo vo); + + /** + * 边带子设备详情数据 + * + * @param dto + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/4/2 17:25 + */ + AjaxResult getDeviceBdChildDetailById(DeviceBdDto dto); + + /** + * 删除边带子设备详情数据 + * @param dto + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/4/2 17:25 + */ + AjaxResult delDeviceBdChildDetail(DeviceBdDto dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java index e681047..7bfdfea 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java @@ -2,12 +2,12 @@ package com.securitycontrol.background.service.impl; import com.securitycontrol.background.mapper.IDeviceOfBdMapper; import com.securitycontrol.background.service.IDeviceOfBdService; -import com.securitycontrol.common.core.constant.Constant; import com.securitycontrol.common.core.utils.StringUtils; import com.securitycontrol.common.core.utils.aes.DateTimeHelper; import com.securitycontrol.common.core.utils.uuid.IdUtils; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.security.utils.ValidatorsUtils; +import com.securitycontrol.entity.background.vo.DeviceBdDetailVo; import com.securitycontrol.entity.background.dto.DeviceBdDto; import com.securitycontrol.entity.background.vo.DeviceBdChildVo; import com.securitycontrol.entity.background.vo.DeviceBdVo; @@ -162,6 +162,7 @@ public class DeviceOfBdServiceImpl implements IDeviceOfBdService { mapper.addOrUpdateDeviceBdChild(vo); } catch (Exception e) { log.error("新增/修改边带设备", e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error(); } return AjaxResult.success(); @@ -194,4 +195,72 @@ public class DeviceOfBdServiceImpl implements IDeviceOfBdService { } return AjaxResult.success(); } + + @Override + public List getDeviceBdChildDetailList(DeviceBdDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getDeviceBdChildDetailList(dto); + } catch (Exception e) { + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + log.error("获取边带子设备详情列表", e); + } + return list; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult addOrUpdateDeviceBdChildDetail(DeviceBdDetailVo vo) { + try { + String validResult = validatorsUtils.valid(vo, DeviceBdDetailVo.Query.class); + if (StringUtils.isNotBlank(validResult)) { + return AjaxResult.error(validResult); + } + int result = mapper.isBdDeviceDetailExist(vo); + if (result > 0) { + return AjaxResult.error("设备级联编码不能重复"); + } + if (StringUtils.isEmpty(vo.getId())) { + String id = IdUtils.getUUId(); + vo.setId(id); + vo.setType(1); + } else { + vo.setType(2); + } + mapper.addOrUpdateDeviceBdChildDetail(vo); + } catch (Exception e) { + log.error("新增/修改边带子设备详情数据", e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + return AjaxResult.success(); + } + + @Override + public AjaxResult getDeviceBdChildDetailById(DeviceBdDto dto) { + DeviceBdDetailVo vo = new DeviceBdDetailVo(); + try { + vo = mapper.getDeviceBdChildDetailById(dto); + } catch (Exception e) { + log.error("边带子设备详情数据", e); + } + return AjaxResult.success(vo); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult delDeviceBdChildDetail(DeviceBdDto dto) { + try { + if (StringUtils.isEmpty(dto.getId())) { + return AjaxResult.error("参数不完整"); + } + mapper.delDeviceBdChildDetail(dto); + } catch (Exception e) { + log.error("删除边带子设备详情数据", e); + //手动回滚异常 + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + return AjaxResult.success(); + } } diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml index d29faec..63d314c 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml @@ -117,6 +117,44 @@ #{bidTime}, + + + + INSERT INTO tb_device_detail + + id, + device_id, + mode_name, + max_value, + min_valu, + data_type, + del_flag, + device_code, + + + #{id}, + #{deviceId}, + #{modeName}, + #{maxValueData}, + #{minValueData}, + #{dataType}, + 0, + #{deviceCode}, + + + + UPDATE tb_device_detail + + device_id = #{deviceId}, + mode_name = #{modeName}, + max_value = #{maxValueData}, + min_valu = #{minValueData}, + data_type = #{dataType}, + device_code = #{deviceCode}, + + WHERE id = #{id} + + UPDATE tb_pro_bd SET del_flag = 1 WHERE id = #{id} @@ -125,6 +163,10 @@ UPDATE tb_bd_device SET del_flag = 1 WHERE device_id = #{id} + + + UPDATE tb_device_detail SET del_flag = 1 WHERE id = #{id} + SELECT COUNT(*) FROM tb_pro_bd WHERE id = #{id} AND bid_code = #{bidCode} + + + + + + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SignProMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SignProMapper.xml index 883e0eb..983728a 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SignProMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SignProMapper.xml @@ -213,7 +213,8 @@ tsp.start_date AS startDate, tsp.end_date AS endDate, tsp.complete_date AS completeDate, - sb.city_name AS orgName + sb.city_name AS orgName, + tsp.signle_no AS signleNo FROM tb_sign_project tsp LEFT JOIN sys_build sb ON tsp.org_id = sb.org_id LEFT JOIN tb_jj_project tjp ON tsp.project_no = tjp.pro_no AND tjp.del_flag = 0 diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/LoginMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/LoginMapper.xml index 442f369..bffa98c 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/LoginMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/LoginMapper.xml @@ -10,7 +10,7 @@