From cfdd2ee1b75cb37805a42a4a2126c1ed5d3f5e8d Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Fri, 19 Apr 2024 14:06:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/service/SysPasswordService.java | 2 +- .../common/core/utils/aes/AesCbcUtils.java | 2 +- .../entity/screen/dto/AlarmMgeDto.java | 4 +- .../screen/dto/ConstructionQualityDto.java | 16 ++++ .../entity/screen/vo/AlarmMgeVo.java | 24 ++++++ .../screen/vo/ConstructionQualityVo.java | 6 ++ .../controller/DownLoadFileController.java | 17 +---- .../ConstructionQualityController.java | 18 ++++- .../controller/OperatingController.java | 4 + .../screen/controller/ScIndexController.java | 6 ++ .../mapper/ConstructionQualityMapper.java | 7 ++ .../service/ConstructionQualityService.java | 6 ++ .../service/impl/AlarmMgeServiceImpl.java | 4 +- .../service/impl/ConstructionQualityImpl.java | 25 +++++++ .../main/resources/mapper/AlarmMgeMapper.xml | 41 +++++------ .../mapper/ConstructionQualityMapper.xml | 73 +++++++++++-------- .../main/resources/mapper/OperatingMapper.xml | 18 ++--- .../mapper/TowerAssInspectMapper.xml | 4 +- .../src/main/resources/mapper/VideoMapper.xml | 14 ++-- .../main/resources/mapper/SelectMapper.xml | 2 +- 20 files changed, 198 insertions(+), 95 deletions(-) diff --git a/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysPasswordService.java b/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysPasswordService.java index 53f1086..71c6f4e 100644 --- a/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysPasswordService.java +++ b/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysPasswordService.java @@ -62,7 +62,7 @@ public class SysPasswordService throw new ServiceException("用户不存在/密码错误",201); } else { - redisService.deleteObject(username); + // redisService.deleteObject(username); clearLoginRecordCache(username); } } diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/aes/AesCbcUtils.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/aes/AesCbcUtils.java index 8a0f11e..8d0d055 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/aes/AesCbcUtils.java +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/aes/AesCbcUtils.java @@ -75,7 +75,7 @@ public class AesCbcUtils { } public static void main(String[] args) { - // String json="username=guest&password=admin@123"; + // String json=""; String json="{\"username\":\"guest\",\"password\":\"admin@123\"}"; String data=encrypt(json); System.err.println(data); diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AlarmMgeDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AlarmMgeDto.java index a14d3e1..a5b763a 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AlarmMgeDto.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AlarmMgeDto.java @@ -24,6 +24,7 @@ public class AlarmMgeDto extends ScreenParamDto { @ApiModelProperty(value = "告警类型") private String warnType; + @ApiModelProperty(value = "状态") private String status; @@ -32,5 +33,6 @@ public class AlarmMgeDto extends ScreenParamDto { @ApiModelProperty(value = "备注") private String remark; - + @ApiModelProperty(value = "告警内容") + private String warnContent; } diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/ConstructionQualityDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/ConstructionQualityDto.java index 04241a3..5545b69 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/ConstructionQualityDto.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/ConstructionQualityDto.java @@ -2,6 +2,7 @@ package com.securitycontrol.entity.screen.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.scheduling.support.SimpleTriggerContext; /** * 告警管理 @@ -36,4 +37,19 @@ public class ConstructionQualityDto extends ScreenParamDto { @ApiModelProperty(value = "施工工艺") private String construction; + + @ApiModelProperty(value = "设备名称") + private String deviceName; + + @ApiModelProperty(value = "时间") + private String times; + + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; + + @ApiModelProperty(value = "检测属性") + private String moduleName; } diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/AlarmMgeVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/AlarmMgeVo.java index 15f79e0..ae1ecd0 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/AlarmMgeVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/AlarmMgeVo.java @@ -11,24 +11,48 @@ import org.hibernate.validator.constraints.Length; */ @Data public class AlarmMgeVo { + @ApiModelProperty(value = "id") private String warnId; + @ApiModelProperty(value = "告警内容") private String warnContent; + @ApiModelProperty(value = "建管单位名称") private String orgName; + @ApiModelProperty(value = "建管单位id") private String orgId; + @ApiModelProperty(value = "工程id") private String proId; + @ApiModelProperty(value = "工程名称") private String proName; + @ApiModelProperty(value = "班组id") private String teamId; + @ApiModelProperty(value = "班组名称") private String teamName; + @ApiModelProperty(value = "班组长名称") private String teamLeader; + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "处理人") + private String userName; + + @ApiModelProperty(value = "状态 0未处理 1 告警 2 未告警") + private String status; + + @ApiModelProperty(value = "处理时间") + private String updateTime; + + + @ApiModelProperty(value = "处理时间") + private String warnTime; } diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ConstructionQualityVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ConstructionQualityVo.java index 4cdc2bc..d97f26f 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ConstructionQualityVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ConstructionQualityVo.java @@ -49,6 +49,9 @@ public class ConstructionQualityVo { @ApiModelProperty(value = "合格次数") private String qualificationNumber; + @ApiModelProperty(value = "检测名称") + private String moduleName; + @ApiModelProperty(value = "变化值") private String changeVal; @@ -61,6 +64,9 @@ public class ConstructionQualityVo { @ApiModelProperty(value = "施工工艺") private String construction; + @ApiModelProperty(value = "告警时间") + private String warnTime; + diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DownLoadFileController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DownLoadFileController.java index e706443..1e17d98 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DownLoadFileController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DownLoadFileController.java @@ -1,32 +1,19 @@ package com.securitycontrol.background.controller; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import com.securitycontrol.background.service.IProService; -import com.securitycontrol.common.core.utils.ExcelStyleUtil; -import com.securitycontrol.common.log.annotation.Log; -import com.securitycontrol.common.log.enums.OperationType; -import com.securitycontrol.entity.system.base.dto.ProDto; -import com.securitycontrol.entity.system.base.vo.ProVo; -import com.securitycontrol.system.export.entity.ProExportVo; + import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.IOUtils; -import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; + /** * @author：cwchen 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 b34e2b2..f4d1ade 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 @@ -30,6 +30,7 @@ public class ConstructionQualityController extends BaseController { @Resource(name = "ConstructionQualityService") private ConstructionQualityService service; + @RequestMapping(value = "/qualityInspection", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "施工质量-质量检测设备") @@ -50,6 +51,7 @@ public class ConstructionQualityController extends BaseController { List list = service.getDetectionRecord(dto); return AjaxResult.success(list); } catch (Exception e) { + log.error(e.toString(),e); return AjaxResult.error(); } } @@ -59,7 +61,6 @@ public class ConstructionQualityController extends BaseController { @Log(title = "告警内容", menu = "告警内容->告警内容", grade = OperationType.QUERY_BUSINESS, details = "查询告警内容", type = "业务日志") public TableDataInfo getConstructionAlarm(ConstructionQualityDto dto) { try{ - startLayPage(); List list = service.getConstructionAlarm(dto); return getDataTableLayui(list); }catch (Exception e){ @@ -82,4 +83,19 @@ public class ConstructionQualityController extends BaseController { } } + + @ApiOperation(value = "施工质量-施工质量历史数据列表") + @GetMapping("getHistoryList") + @Log(title = "施工质量列表", menu = "施工质量列表->施工质量列表", grade = OperationType.QUERY_BUSINESS, details = "查询施工质量历史数据", type = "业务日志") + public TableDataInfo getHistoryList(ConstructionQualityDto dto) { + try{ + startLayPage(); + List list = service.getHistoryList(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/controller/OperatingController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java index 13f57ab..f01491d 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java @@ -29,8 +29,12 @@ public class OperatingController extends BaseController { @Resource(name = "OperatingService") private OperatingService service; + + + @RequestMapping(value = "/RealTimeMonitoring", method = RequestMethod.POST) @ApiOperation(value = "作业环境-实时监测") + @Log(title = "实时监测", menu = "作业环境->实时监测", grade = OperationType.QUERY_BUSINESS, details = "查询实时检测", type = "业务日志") public AjaxResult getRealTimeMonitoring(@RequestBody OperatingQualityDto dto) { try { List list = service.getRealTimeMonitoring(dto); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ScIndexController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ScIndexController.java index e1102db..ff06840 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ScIndexController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ScIndexController.java @@ -76,4 +76,10 @@ public class ScIndexController { public AjaxResult efficiencyAnalysis(ScreenParamDto dto){ return service.efficiencyAnalysis(dto); } + + @ApiOperation(value = "杆塔集合查询") + @GetMapping("getGtList") + public AjaxResult getGtList(ScreenParamDto dto){ + return service.efficiencyAnalysis(dto); + } } 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 d34fbbc..8cd3e9d 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 @@ -51,4 +51,11 @@ public interface ConstructionQualityMapper { * @date 2024/3/27 19:54 */ List getConstructionQualityList(ConstructionQualityDto dto); + + /** + * 查询施工质量设备历史告警信息 + * @param dto + * @return + */ + List getHistoryList(ConstructionQualityDto 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 84651a4..263f404 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 @@ -49,4 +49,10 @@ public interface ConstructionQualityService { */ List getConstructionQualityList(ConstructionQualityDto dto); + /** + * 查询施工质量历史数据记录 + * @param dto + * @return + */ + List getHistoryList(ConstructionQualityDto dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AlarmMgeServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AlarmMgeServiceImpl.java index e66421e..de08088 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AlarmMgeServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AlarmMgeServiceImpl.java @@ -39,7 +39,7 @@ public class AlarmMgeServiceImpl implements AlarmMgeService { try { list = mapper.getAlarmMgeList(dto); } catch (Exception e) { - log.error("获取告警管理列表",e); + log.error(e.toString(),e); } return list; } @@ -56,7 +56,7 @@ public class AlarmMgeServiceImpl implements AlarmMgeService { dto.setUserId(user.getUserid()+""); dto.setUserName(user.getUsername()); int num= mapper.warnProcess(dto); - if(num> SystemGlobal.SUCCESS_NUM){ + if(num==SystemGlobal.SUCCESS_NUM){ return Result.ok("操作成功","操作成功"); } return Result.fail("操作失败"); 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 10ec20b..4e5be6b 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,5 +1,6 @@ package com.securitycontrol.screen.service.impl; +import com.securitycontrol.common.core.utils.aes.StringHelper; import com.securitycontrol.entity.screen.dto.ConstructionQualityDto; import com.securitycontrol.entity.screen.vo.ConstructionQualityVo; import com.securitycontrol.screen.mapper.ConstructionQualityMapper; @@ -74,6 +75,30 @@ public class ConstructionQualityImpl implements ConstructionQualityService { return list; } + /** + * 查询施工质量历史数据信息 + * @param dto + * @return + */ + @Override + public List getHistoryList(ConstructionQualityDto dto) { + List list = new ArrayList<>(); + try{ + if(StringHelper.isNotEmpty(dto.getTimes())){ + dto.setStartTime(dto.getTimes().split(" - ")[0]); + dto.setEndTime(dto.getTimes().split(" - ")[1]); + } + + list = mapper.getHistoryList(dto); + + }catch (Exception e){ + log.error(e.toString(),e); + } + + + return list; + } + /** * 施工质量-检测记录对比 * @param dto diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml index 50daf5f..0367dbf 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml @@ -8,30 +8,25 @@ \ No newline at end of file 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 ac2eaca..f037c92 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml @@ -9,7 +9,7 @@ DATE_FORMAT(thdv.create_time,'%Y-%m') as month, SUM(CASE WHEN thdv.is_warn = 1 THEN 1 ELSE 0 END) as qualificationNumber FROM tb_his_device_value thdv - LEFT JOIN tb_device_detail tdd ON thdv.id = tdd.id + LEFT JOIN tb_device_detail tdd ON thdv.attribute_id = tdd.id LEFT JOIN tb_bd_device tbd ON tdd.device_id = tbd.device_id LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id WHERE tpb.bid_code = #{bidCode} and DATE_FORMAT(thdv.create_time,'%Y-%m') = #{month} @@ -25,12 +25,15 @@ @@ -49,39 +52,45 @@ LEFT JOIN tb_device_detail tdd ON tdd.device_id = tbd.device_id LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id WHERE - tbd.devic_type = 1906 and tpb.bid_code = #{bidCode} and tbd.device_code = 1906001 + tbd.devic_type =1906 and tpb.bid_code = #{bidCode} + - \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml index 918190a..156e569 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml @@ -4,15 +4,15 @@ diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/TowerAssInspectMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/TowerAssInspectMapper.xml index 1cdfa7c..bb32229 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/TowerAssInspectMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/TowerAssInspectMapper.xml @@ -29,7 +29,7 @@ FROM tb_device_detail tdd LEFT JOIN tb_his_device_value thdv ON tdd.id = thdv.attribute_id WHERE tdd.device_id = #{deviceId} AND tdd.id = #{id} and tdd.del_flag = '0' - ORDER BY thdv.create_time DESC + ORDER BY thdv.create_time ASC SELECT ta.area_name as areaName,tdd.mode_name as modeName, thdv.val , - tdd.change_val as thisChangeVal, thdv.change_val as changeVal,tdd.update_time as updateTime, + thdv.change_val as changeVal,tdd.update_time as updateTime, case when thdv.is_warn = '0' then '未告警' else '告警' end isWarn FROM tb_device_detail tdd LEFT JOIN tb_bd_device tbd ON tdd.device_id = tbd.device_id diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/VideoMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/VideoMapper.xml index de65b98..45d7286 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/VideoMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/VideoMapper.xml @@ -7,15 +7,15 @@ (SELECT '0' AS id,'球机' AS title, '-1' AS parentId,'0' AS onLine,'1' AS level) UNION ALL ( - SELECT CONCAT('QJ',td.device_code) AS id, - td.device_name AS title, + SELECT CONCAT('QJ',tcm.puid) AS id, + tcm.pro_name AS title, '0' AS parentId, - on_line AS onLine, + IFNULL(on_line,0) AS onLine, '2' AS level - FROM tb_device td - INNER JOIN t_class_metting tcm on td.device_code = tcm.puid AND tcm.work_day = CURRENT_DATE - WHERE td.del_flag = 0 - + FROM t_class_metting tcm + left JOIN tb_device td on td.device_code = tcm.puid AND td.del_flag=0 + WHERE tcm.del_flag = 0 AND tcm.work_day = CURRENT_DATE AND TCM.puid is not null + AND INSTR(td.device_name,#{param}) > 0 diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/SelectMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/SelectMapper.xml index 0263d81..d31e6cc 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/SelectMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/SelectMapper.xml @@ -136,7 +136,7 @@ FROM sys_dict sd LEFT JOIN sys_dict sd2 ON sd.dict_code = sd2.p_code AND sd2.del_flag = 0 WHERE sd.dict_code = '9990' AND sd.del_flag = 0 - ORDER BY sd2.dict_sort + ORDER BY sd2.dict_sort DESC