From e07c9419b07fee6707b00a5c39657afc781903c9 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Tue, 4 Jun 2024 16:52:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E5=8F=8A=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20=E7=BB=B4=E6=8A=A4=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/utils/PageUtils.java | 1 - .../common/core/utils/ValidateUtil.java | 4 +- .../entity/background/vo/DeviceDataVo.java | 73 +++++++++++++++++ .../gateway/config/CaptchaConfig.java | 5 +- .../controller/DeviceController.java | 70 +++++++++++++++- .../controller/ScheduleController.java | 4 +- .../background/mapper/DeviceMapper.java | 36 +++++++++ .../background/service/DeviceService.java | 36 +++++++++ .../service/impl/DeviceServiceImpl.java | 79 +++++++++++++++++++ .../src/main/resources/bootstrap.yml | 3 +- .../main/resources/mapper/DeviceMapper.xml | 56 +++++++++++++ .../ConstructionQualityController.java | 19 +++++ .../mapper/ConstructionQualityMapper.java | 8 ++ .../service/ConstructionQualityService.java | 8 ++ .../service/impl/ConstructionQualityImpl.java | 12 +++ .../mapper/ConstructionQualityMapper.xml | 10 +++ .../mapper/PersonnelControlMapper.xml | 26 +++--- .../system/service/SysLogServiceImpl.java | 4 +- .../system/service/UserServiceImpl.java | 7 ++ 19 files changed, 434 insertions(+), 27 deletions(-) create mode 100644 securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceDataVo.java diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/PageUtils.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/PageUtils.java index 310701b..bb81a63 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/PageUtils.java +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/PageUtils.java @@ -17,7 +17,6 @@ public class PageUtils extends PageHelper public static void startPage() { PageDomain pageDomain = TableSupport.buildPageRequest(); - Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); Boolean reasonable = pageDomain.getReasonable(); diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ValidateUtil.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ValidateUtil.java index 56e0938..13bf487 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ValidateUtil.java +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ValidateUtil.java @@ -7,8 +7,8 @@ public class ValidateUtil { public static void main(String[] args) { - System.err.println(("admin@123456")); - System.err.println(validatePassword("admin@123456")); + System.err.println(("Admin@1234567")); + System.err.println(validatePassword("Admin@123456")); } /** diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceDataVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceDataVo.java new file mode 100644 index 0000000..7d15b46 --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceDataVo.java @@ -0,0 +1,73 @@ +package com.securitycontrol.entity.background.vo; + +import lombok.Data; + +/** + * 数据维护u实体类 + * @author 黑子 + */ +@Data +public class DeviceDataVo { + + /** + * 关键字 + */ + private String keyWord; + /** + * 主键 + */ + private String id; + /** + * 标段编码 + */ + private String bidCode; + + private String bidName; + /** + * 工程状态 + */ + private String proState; + /** + * 监测点名称 + */ + private String name; + /** + * 测点相对标高 + */ + private String height; + /** + * 检测值 + */ + private String val; + /** + * 累计沉降 + */ + private String hisVal; + /** + * 创建时间 + */ + private String createTime; + /** + * 计量型号设备编码 + */ + private String devCode; + /** + * 检测人 + */ + private String jcUser; + /** + * 校核人 + */ + private String jhUser; + /** + * 数据类型 + */ + private String dataType; + /** + * 单位 + */ + private String unit; + + + +} diff --git a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/config/CaptchaConfig.java b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/config/CaptchaConfig.java index afa511b..0cf48f5 100644 --- a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/config/CaptchaConfig.java +++ b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/config/CaptchaConfig.java @@ -5,6 +5,8 @@ import com.google.code.kaptcha.util.Config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import java.util.ArrayList; +import java.util.List; import java.util.Properties; import static com.google.code.kaptcha.Constants.*; @@ -46,8 +48,7 @@ public class CaptchaConfig } @Bean(name = "captchaProducerMath") - public DefaultKaptcha getKaptchaBeanMath() - { + public DefaultKaptcha getKaptchaBeanMath() { DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); Properties properties = new Properties(); // 是否有边框 默认为true 我们可以自己设置yes，no diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DeviceController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DeviceController.java index aa2ab48..3231950 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DeviceController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DeviceController.java @@ -9,6 +9,7 @@ import com.securitycontrol.common.log.enums.OperationType; import com.securitycontrol.entity.background.dto.DeviceBdDto; import com.securitycontrol.entity.background.dto.DeviceDto; import com.securitycontrol.entity.background.vo.DeviceBdVo; +import com.securitycontrol.entity.background.vo.DeviceDataVo; import com.securitycontrol.entity.background.vo.DeviceVo; import com.securitycontrol.entity.system.vo.DictVo; import io.swagger.annotations.ApiOperation; @@ -55,7 +56,7 @@ public class DeviceController extends BaseController { * @return */ @PostMapping("addDevice") - @Log(title = "设备管理", menu = "设备管理->新增设备", grade = OperationType.ADD_BUSINESS, details = "查询设备列表", type = "业务日志") + @Log(title = "设备管理", menu = "设备管理->设备管理", grade = OperationType.ADD_BUSINESS, details = "查询设备列表", type = "业务日志") public Result addDevice(@RequestBody @Valid DeviceVo dto) { return service.addDevice(dto); } @@ -68,7 +69,7 @@ public class DeviceController extends BaseController { * @return */ @PostMapping("updateDevice") - @Log(title = "设备管理", menu = "设备管理->修改设备", grade = OperationType.UPDATE_BUSINESS, details = "查询设备列表", type = "业务日志") + @Log(title = "设备管理", menu = "设备管理->设备管理", grade = OperationType.UPDATE_BUSINESS, details = "查询设备列表", type = "业务日志") public Result updateDevice(@RequestBody @Valid DeviceVo dto) { return service.updateDevice(dto); } @@ -80,7 +81,7 @@ public class DeviceController extends BaseController { * @return */ @PostMapping("deleteDevice") - @Log(title = "设备管理", menu = "设备管理->注销设备", grade = OperationType.DELETE_BUSINESS, details = "查询设备列表", type = "业务日志") + @Log(title = "注销设备", menu = "设备管理->设备管理", grade = OperationType.DELETE_BUSINESS, details = "注销设备", type = "业务日志") public Result deleteDevice(@RequestBody @Valid DeviceVo dto) { return service.deleteDevice(dto); } @@ -105,4 +106,67 @@ public class DeviceController extends BaseController { public Result> getDeviceListByType(DeviceDto dto) { return service.getDeviceListByType(dto); } + + + + @ApiOperation(value = "获取设备列表") + @GetMapping("getDavDataList") + @Log(title = "设备管理", menu = "设备管理->数据维护", grade = OperationType.QUERY_BUSINESS, details = "查询数据维护列表", type = "业务日志") + public TableDataInfo getDavDataList(DeviceDataVo dto) { + try{ + startPage(); + List list = service.getDavDataList(dto); + return getDataTable(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBad(new ArrayList<>(),"请求出错了"); + } + } + + /** + * 新增数据 + * @param dto + * @return + */ + @PostMapping("addDevData") + @Log(title = "设备管理", menu = "设备管理->数据维护", grade = OperationType.ADD_BUSINESS, details = "新增检测数据", type = "业务日志") + public Result addDevData(@RequestBody DeviceDataVo dto) { + return service.addDevData(dto); + } + + + /** + * 新增设备 + * @param dto + * @return + */ + @PostMapping("updateDevData") + @Log(title = "设备管理", menu = "设备管理->数据维护", grade = OperationType.UPDATE_BUSINESS, details = "更新数据", type = "业务日志") + public Result updateDevData(@RequestBody DeviceDataVo dto) { + return service.updateDevData(dto); + } + + /** + * 新增设备 + * + * @param dto + * @return + */ + @PostMapping("deleteDevData") + @Log(title = "设备管理", menu = "设备管理->数据维护", grade = OperationType.DELETE_BUSINESS, details = "删除数据", type = "业务日志") + public Result deleteDevData(@RequestBody @Valid DeviceDataVo dto) { + return service.deleteDevData(dto); + } + /** + * 新增设备 + * + * @param dto + * @return + */ + @PostMapping("getDevDataById") + public Result getDevDataById(@RequestBody @Valid DeviceDataVo dto) { + return service.getDevDataById(dto); + } + + } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ScheduleController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ScheduleController.java index 2b157eb..0b3dfbf 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ScheduleController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ScheduleController.java @@ -23,8 +23,7 @@ public class ScheduleController { @Autowired private IDeviceOfBdMapper deviceOfBdMapper; - @Scheduled(cron = "10 * * * * ?") - @PostConstruct + @Scheduled(cron = "0 0/30 * * * ?") public void getProInfo() { try { System.err.println("开始扫描不在线的设备----->"); @@ -34,7 +33,6 @@ public class ScheduleController { deviceOfBdMapper.updateDeviceState(id); }); } - }catch (Exception e){ log.error(e.toString(),e); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/DeviceMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/DeviceMapper.java index 7a2d98e..e06afc2 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/DeviceMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/DeviceMapper.java @@ -2,6 +2,7 @@ package com.securitycontrol.background.mapper; import com.securitycontrol.common.core.domain.Result; import com.securitycontrol.entity.background.dto.DeviceDto; +import com.securitycontrol.entity.background.vo.DeviceDataVo; import com.securitycontrol.entity.background.vo.DeviceVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -64,4 +65,39 @@ public interface DeviceMapper { * @return */ List getDeviceListByType(@Param("code") int code); + + /** + * 查询维护us胡金 + * @param dto + * @return + */ + List getDavDataList(DeviceDataVo dto); + + /** + * 更新 维护数据数据 + * @param dto + * @return + */ + int updateDevData(DeviceDataVo dto); + + /** + * 新增维护数据 + * @param dto + * @return + */ + int addDevData(DeviceDataVo dto); + + /** + *查询数据详情 + * @param dto + * @return + */ + DeviceDataVo getDevDataById(DeviceDataVo dto); + + /** + * 删除维护数据 + * @param dto + * @return + */ + int deleteDevData(DeviceDataVo dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/DeviceService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/DeviceService.java index d9b0acd..605dec7 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/DeviceService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/DeviceService.java @@ -3,6 +3,7 @@ package com.securitycontrol.background.service; import com.securitycontrol.common.core.domain.Result; import com.securitycontrol.entity.background.dto.DeviceDto; import com.securitycontrol.entity.background.vo.DeviceBdVo; +import com.securitycontrol.entity.background.vo.DeviceDataVo; import com.securitycontrol.entity.background.vo.DeviceVo; import java.util.List; @@ -54,4 +55,39 @@ public interface DeviceService { * @return */ Result> getDeviceListByType(DeviceDto dto); + + /** + * 查询 维护数据 + * @param dto + * @return + */ + List getDavDataList(DeviceDataVo dto); + + /** + * 更新维护数据 + * @param dto + * @return + */ + Result updateDevData(DeviceDataVo dto); + + /** + * 新增维护数据 + * @param dto + * @return + */ + Result addDevData(DeviceDataVo dto); + + /** + * 删除维护数据 + * @param dto + * @return + */ + Result deleteDevData(DeviceDataVo dto); + + /** + * 查询维护数据 + * @param dto + * @return + */ + Result getDevDataById(DeviceDataVo dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceServiceImpl.java index fc6bf3c..cf72680 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceServiceImpl.java @@ -6,6 +6,7 @@ import com.securitycontrol.common.core.domain.Result; import com.securitycontrol.common.core.utils.aes.StringHelper; import com.securitycontrol.common.core.utils.uuid.IdUtils; import com.securitycontrol.entity.background.dto.DeviceDto; +import com.securitycontrol.entity.background.vo.DeviceDataVo; import com.securitycontrol.entity.background.vo.DeviceVo; import com.securitycontrol.entity.system.SystemGlobal; import lombok.extern.slf4j.Slf4j; @@ -142,6 +143,84 @@ public class DeviceServiceImpl implements DeviceService { } + /** + * 查询维护数据 按照类型 + * @param dto + * @return + */ + @Override + public List getDavDataList(DeviceDataVo dto) { + try{ + return mapper.getDavDataList(dto); + }catch (Exception e){ + log.error(e.toString(),e); + return new ArrayList(); + } + } + + /** + * 更新维护数据 + * @param dto + * @return + */ + @Override + public Result updateDevData(DeviceDataVo dto) { + try{ + int num= mapper.updateDevData(dto); + if(num==SystemGlobal.SUCCESS_NUM){ + return Result.ok("修改成功","修改成功"); + } + return Result.fail("修改失败,请联系管理员"); + }catch (Exception e){ + log.error(e.toString(),e); + return Result.fail("系统升级中,请稍后重试"); + } + } + + /** + * 新增维护数据 + * @param dto + * @return + */ + @Override + public Result addDevData(DeviceDataVo dto) { + try{ + int num= mapper.addDevData(dto); + if(num==SystemGlobal.SUCCESS_NUM){ + return Result.ok("新增成功","新增成功"); + } + return Result.fail("新增失败,请联系管理员"); + }catch (Exception e){ + log.error(e.toString(),e); + return Result.fail("系统升级中,请稍后重试"); + } + } + + @Override + public Result deleteDevData(DeviceDataVo dto) { + try{ + int num= mapper.deleteDevData(dto); + if(num==SystemGlobal.SUCCESS_NUM){ + return Result.ok("删除成功","删除成功"); + } + return Result.fail("删除失败,请联系管理员"); + }catch (Exception e){ + log.error(e.toString(),e); + return Result.fail("系统升级中,请稍后重试"); + } + } + + @Override + public Result getDevDataById(DeviceDataVo dto) { + try{ + DeviceDataVo vo= mapper.getDevDataById(dto); + return Result.ok(vo); + }catch (Exception e){ + log.error(e.toString(),e); + return Result.fail("系统升级中,请稍后重试"); + } + } + public String checkData(DeviceVo deviceVo){ try{ Integer num=mapper.getDeviceNumByQuery(deviceVo,"1"); diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml b/securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml index 38bc04d..8657e65 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml @@ -40,5 +40,6 @@ jasypt: file: upload_path: /data/zhgd/file temp_file_path: /data/zhgd/file - +pagehelper: + helper-dialect: mysql diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml index 34a16fe..1aa42c5 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml @@ -24,6 +24,7 @@ #{macId},#{gbCode},#{deviceType},now(),0,#{manufacturer},#{onLine},#{tyCode},#{idx} ) + update tb_device set device_name=#{deviceName},device_code=#{puId},mac_id=#{macId}, @@ -31,9 +32,31 @@ on_line=#{onLine},t_code=#{tyCode},idx=#{idx},update_time=now() where device_id=#{deviceId} + + + insert into tb_device_data(bid_code,bid_name,name, + height,val,his_val,create_time,jc_user, + dev_code,jh_user,data_type,unit) value ( + #{bidCode},#{bidName},#{name}, + #{height},#{val},#{hisVal},#{createTime},#{jcUser}, + #{devCode},#{jhUser},#{dataType},#{unit} + ) + + + + update tb_device_data + set bid_code=#{bidCode},bid_name=#{bidName},name=#{name}, + height=#{height},val=#{val},his_val=#{hisVal}, + create_time=#{createTime},jc_user=#{jcUser},dev_code=#{devCode}, + jh_user=#{jhUser},data_type=#{dataType},unit=#{unit} + where id=#{id} + update tb_device set del_flag=1 where device_id=#{deviceId} and del_flag=0 + + delete from tb_device_data where id=#{id} + + + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ConstructionQualityController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ConstructionQualityController.java index f4d1ade..5a321ba 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ConstructionQualityController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ConstructionQualityController.java @@ -5,6 +5,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.DeviceDataVo; import com.securitycontrol.entity.screen.dto.AlarmMgeDto; import com.securitycontrol.entity.screen.dto.ConstructionQualityDto; import com.securitycontrol.entity.screen.vo.AlarmMgeVo; @@ -98,4 +99,22 @@ public class ConstructionQualityController extends BaseController { } } + /** + * 检测记录拆线呢 + * @param dto + * @return + */ + @ApiOperation(value = "施工质量-沉降点记录") + @GetMapping("getDevDataList") + @Log(title = "施工质量列表", menu = "施工质量列表->沉降点记录", grade = OperationType.QUERY_BUSINESS, details = "查询沉降点记录", type = "业务日志") + public TableDataInfo getDevDataList(DeviceDataVo dto) { + try{ + startLayPage(); + List list = service.getDevDataList(dto); + return getDataTableLayui(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBadLayui(new ArrayList(),"请求出错了"); + } + } } 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 8cd3e9d..68cab2e 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 @@ -1,5 +1,6 @@ package com.securitycontrol.screen.mapper; +import com.securitycontrol.entity.background.vo.DeviceDataVo; import com.securitycontrol.entity.screen.dto.ConstructionQualityDto; import com.securitycontrol.entity.screen.vo.ConstructionQualityVo; import org.springframework.stereotype.Repository; @@ -58,4 +59,11 @@ public interface ConstructionQualityMapper { * @return */ List getHistoryList(ConstructionQualityDto dto); + + /** + * 查询检测数据 + * @param dto + * @return + */ + List getDevDataList(DeviceDataVo 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 263f404..14d6bc1 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 @@ -1,5 +1,6 @@ package com.securitycontrol.screen.service; +import com.securitycontrol.entity.background.vo.DeviceDataVo; import com.securitycontrol.entity.screen.dto.ConstructionQualityDto; import com.securitycontrol.entity.screen.vo.ConstructionQualityVo; @@ -55,4 +56,11 @@ public interface ConstructionQualityService { * @return */ List getHistoryList(ConstructionQualityDto dto); + + /** + * 查询检测记录 + * @param dto + * @return + */ + List getDevDataList(DeviceDataVo 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 8cfec0d..0ea4196 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 @@ -1,6 +1,7 @@ package com.securitycontrol.screen.service.impl; import com.securitycontrol.common.core.utils.aes.StringHelper; +import com.securitycontrol.entity.background.vo.DeviceDataVo; import com.securitycontrol.entity.screen.dto.ConstructionQualityDto; import com.securitycontrol.entity.screen.vo.ConstructionQualityVo; import com.securitycontrol.screen.mapper.ConstructionQualityMapper; @@ -99,6 +100,17 @@ public class ConstructionQualityImpl implements ConstructionQualityService { return list; } + @Override + public List getDevDataList(DeviceDataVo dto) { + List list = new ArrayList<>(); + try{ + list = mapper.getDevDataList(dto); + }catch (Exception e){ + log.error(e.toString(),e); + } + return list; + } + /** * 施工质量-检测记录对比 * @param dto diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml index d249bbc..48f1f4d 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml @@ -93,6 +93,16 @@ and tdv.create_time BETWEEN #{startTime} AND #{endTime} + \ 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 716cc4f..113b0b0 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml @@ -73,14 +73,14 @@ SELECT - his.val as val, - GROUP_CONCAT(his2.val) aslatLon, + ANY_VALUE(his.val) as val, + ANY_VALUE( GROUP_CONCAT(his2.val)) aslatLon, his.source_type as sourceType from tb_his_device_value his left join tb_his_device_value his2 on his.source_type=his2.source_type AND his.id!=his2.id diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/SysLogServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/SysLogServiceImpl.java index d95cbf6..b3a9a9a 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/SysLogServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/SysLogServiceImpl.java @@ -146,12 +146,12 @@ public class SysLogServiceImpl implements ISysLogService { return Result.fail("请输入数字"); } }else{ - return Result.fail("日志容量最低是1024Mb"); + return Result.fail("日志容量最低是"+SystemGlobal.LOG_DEFEAT+"Mb"); } Double cap=Double.parseDouble(capacity); if(cap