From c5ec741499366febb78fcd4f9f105c59ece87ac8 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 29 Mar 2024 15:27:06 +0800 Subject: [PATCH 1/3] APP --- .../common/core/utils/aes/DateTimeHelper.java | 2 +- .../background/controller/AppController.java | 12 +++ .../background/mapper/IAppMapper.java | 41 +++++++- .../background/service/IAppService.java | 22 +++++ .../service/impl/AppServiceImpl.java | 93 +++++++++++++++---- .../src/main/resources/mapper/AppMapper.xml | 44 +++++++++ 6 files changed, 193 insertions(+), 21 deletions(-) diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/aes/DateTimeHelper.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/aes/DateTimeHelper.java index fee0990..5d0408a 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/aes/DateTimeHelper.java +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/aes/DateTimeHelper.java @@ -810,7 +810,7 @@ public class DateTimeHelper { * @author cwchen * @date 2024/3/16 15:11 */ - public static Long convertDateStringToTimestamp(String dateString, String format) throws Exception { + public static Long convertDateStringToTimestamp(String dateString, String format){ Date date = null; try { SimpleDateFormat sdf = new SimpleDateFormat(format); diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/AppController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/AppController.java index d424d36..fdd7d94 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/AppController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/AppController.java @@ -52,4 +52,16 @@ public class AppController { public AjaxResult proProgress(ParamDto dto){ return service.proProgress(dto); } + + @ApiOperation(value = "告警") + @GetMapping("alarmLists") + public AjaxResult alarmLists(ParamDto dto){ + return service.alarmLists(dto); + } + + @ApiOperation(value = "工程管理") + @GetMapping("proManagement") + public AjaxResult proManagement(ParamDto dto){ + return service.proManagement(dto); + } } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IAppMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IAppMapper.java index e907d53..35a3357 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IAppMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IAppMapper.java @@ -6,6 +6,7 @@ import com.securitycontrol.entity.background.vo.VehicleVo; import com.securitycontrol.entity.system.base.vo.ProVo; import com.securitycontrol.entity.system.vo.ResourceFileVo; import org.apache.ibatis.annotations.MapKey; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -78,12 +79,50 @@ public interface IAppMapper { /** * 项目进度 + * * @param dto - * @return List> + * @return List> * @description * @author cwchen * @date 2024/3/28 20:22 */ @MapKey("bidCode") List> getProBasicInfo(ParamDto dto); + + /** + * 告警 + * + * @param dto + * @return List> + * @description + * @author cwchen + * @date 2024/3/29 10:25 + */ + @MapKey("id") + List> alarmLists(ParamDto dto); + + + /** + * 工程工序计划 + * + * @param dto + * @return List> + * @description + * @author cwchen + * @date 2024/3/29 11:29 + */ + @MapKey("bidCode") + List> getProGxPlan(ParamDto dto); + + /** + * 获取工序或杆塔名称 + * @param proType + * @param bidCode + * @param gxId + * @return String + * @description + * @author cwchen + * @date 2024/3/29 14:20 + */ + String getGtOrGxName(@Param("proType") String proType, @Param("bidCode")String bidCode, @Param("gxId")String gxId); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IAppService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IAppService.java index fbb994d..d28090c 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IAppService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IAppService.java @@ -56,6 +56,7 @@ public interface IAppService { /** * 项目进度 + * * @param dto * @return AjaxResult * @description @@ -63,4 +64,25 @@ public interface IAppService { * @date 2024/3/28 20:19 */ AjaxResult proProgress(ParamDto dto); + + /** + * 告警 + * + * @param dto + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/3/29 10:24 + */ + AjaxResult alarmLists(ParamDto dto); + + /** + * 工程管理 + * @param dto + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/3/29 10:46 + */ + AjaxResult proManagement(ParamDto dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java index c4e6f67..6121b3b 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java @@ -92,22 +92,22 @@ public class AppServiceImpl implements IAppService { list = mapper.getPersonnelList(dto); for (HumanManageVo vo : list) { String decryptIdNumber = AesCbcUtils.decrypt(vo.getIdNumber()); - if(decryptIdNumber != null){ + if (decryptIdNumber != null) { vo.setIdNumber(decryptIdNumber); vo.setSex(getGenderByIdCard(decryptIdNumber)); - }else{ + } else { vo.setSex(getGenderByIdCard(vo.getIdNumber())); } } } catch (Exception e) { - log.error("人员管理",e); + log.error("人员管理", e); } return AjaxResult.success(list); } public static String getGenderByIdCard(String idCard) { if (StringUtils.isNotEmpty(idCard)) { - if(idCard.length() == Constant.ID_CARD || idCard.length() == Constant.ID_CARD2){ + if (idCard.length() == Constant.ID_CARD || idCard.length() == Constant.ID_CARD2) { idCard = idCard.length() == 15 ? idCard.substring(0, 6) + "19" + idCard.substring(6) : idCard; char genderCode = idCard.charAt(16); return (genderCode % 2) == 0 ? "女" : "男"; @@ -122,7 +122,7 @@ public class AppServiceImpl implements IAppService { try { list = mapper.getCarList(dto); } catch (Exception e) { - log.error("人员管理",e); + log.error("人员管理", e); } return AjaxResult.success(list); } @@ -132,7 +132,7 @@ public class AppServiceImpl implements IAppService { Map dataMap = new HashMap<>(16); List> list = new ArrayList<>(); try { - list= mapper.getProBasicInfo(dto); + list = mapper.getProBasicInfo(dto); Map>> map = list.stream().collect(Collectors.groupingBy(item -> { return String.valueOf(item.get("bidCode")); })); @@ -148,27 +148,82 @@ public class AppServiceImpl implements IAppService { value = value.add(bigDecimal.multiply(bigDecimal2).divide(multipleValue, 3, BigDecimal.ROUND_HALF_UP)); } } - // 计划开始时间、计划结束时间、实际进度 + // 计划开始时间、计划结束时间、实际进度、计划工期 String planStartTime = String.valueOf(v.get(0).get("planStartTime")); - String planEndTime = String.valueOf(v.get(0).get("planStartTime")); + String planEndTime = String.valueOf(v.get(0).get("planEndTime")); String nowDate = DateTimeHelper.getNowDate(); - dataMap.put("planStartTime",planStartTime); - dataMap.put("planEndTime",planEndTime); - dataMap.put("value", value.doubleValue()); - - // 计划进度、计划工期 Long dayDifference = DateTimeHelper.getDayDifference(planStartTime, planEndTime); - Long residueDay = DateTimeHelper.getDayDifference(planStartTime, nowDate); - BigDecimal dayDifferenceBd = BigDecimal.valueOf(dayDifference); - BigDecimal residueDayBd = BigDecimal.valueOf(residueDay); -// dayDifference - value2 = value2.add(residueDayBd.divide(dayDifferenceBd, 3, BigDecimal.ROUND_HALF_UP)); - dataMap.put("value2",value2.doubleValue()); + dataMap.put("planStartTime", planStartTime); + dataMap.put("planEndTime", planEndTime); + dataMap.put("value", value.doubleValue()); dataMap.put("durationDay", dayDifference); + + Long planStartTimeTamp = DateTimeHelper.convertDateStringToTimestamp(planStartTime, "yyyy-MM-dd"); + Long planEndTimeTamp = DateTimeHelper.convertDateStringToTimestamp(planEndTime, "yyyy-MM-dd"); + Long nowDateTamp = DateTimeHelper.convertDateStringToTimestamp(nowDate, "yyyy-MM-dd"); + // 计划进度 + if (nowDateTamp < planStartTimeTamp) { + dataMap.put("value2", new Double(0)); + } else if (nowDateTamp > planEndTimeTamp) { + dataMap.put("value2", new Double(100)); + } else { + // 工程已施工天数 + Long residueDay = DateTimeHelper.getDayDifference(planStartTime, nowDate); + // 剩余工期 + Long residueDay2 = DateTimeHelper.getDayDifference(nowDate, planEndTime); + BigDecimal dayDifferenceBd = BigDecimal.valueOf(dayDifference); + BigDecimal residueDayBd = BigDecimal.valueOf(residueDay); + value2 = value2.add(residueDayBd.divide(dayDifferenceBd, 3, BigDecimal.ROUND_HALF_UP).multiply(multipleValue)); + dataMap.put("value2", value2.doubleValue()); + dataMap.put("residueDay", residueDay2); + } }); } catch (Exception e) { log.error("项目进度"); } return AjaxResult.success(dataMap); } + + @Override + public AjaxResult alarmLists(ParamDto dto) { + List> list = new ArrayList<>(); + try { + list = mapper.alarmLists(dto); + } catch (Exception e) { + log.error("告警", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult proManagement(ParamDto dto) { + Map dataMap = new HashMap<>(16); + ProVo vo = new ProVo(); + JSONObject item = new JSONObject(); + List> proGxPlanList = new ArrayList<>(); + try { + // 工程详情 + vo = mapper.getProBrief(dto); + AjaxResult ajaxResult = proProgress(dto); + String jsonString = JSON.toJSONString(ajaxResult.get("data")); + item = JSON.parseObject(jsonString); + // 施工进度 + proGxPlanList = mapper.getProGxPlan(dto); + if(CollectionUtils.isNotEmpty(proGxPlanList)){ + proGxPlanList.forEach(mapData->{ + String proType = String.valueOf(mapData.get("proType")); + String bidCode = String.valueOf(mapData.get("bidCode")); + String gxId = String.valueOf(mapData.get("gxId")); + String name = mapper.getGtOrGxName(proType, bidCode, gxId); + mapData.put("name",name); + }); + } + } catch (Exception e) { + log.error("工程管理", e); + } + dataMap.put("vo",vo); + dataMap.put("item",item); + dataMap.put("proGxPlanList",proGxPlanList); + return AjaxResult.success(dataMap); + } } diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml index da8d95a..456af75 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml @@ -78,4 +78,48 @@ )a ON tgp.plan_id = a.planId WHERE tp.del_flag = 0 AND tp.bid_code = #{bidCode} + + + + + + \ No newline at end of file From bae27c5ea20f04dac13c391aa2ad1df1992a2455 Mon Sep 17 00:00:00 2001 From: sliang <1589399930@qq.com> Date: Fri, 29 Mar 2024 15:39:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=20-=20=E7=BB=84=E5=A1=94?= =?UTF-8?q?=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/screen/dto/TowerAssInspectDto.java | 17 ++++ .../entity/screen/vo/TowerAssInspectVo.java | 46 ++++++++++ .../controller/TowerAssInspectController.java | 88 +++++++++++++++++++ .../screen/mapper/TowerAssInspectMapper.java | 16 ++++ .../service/TowerAssInspectService.java | 17 ++++ .../impl/TowerAssInspectServiceImpl.java | 88 +++++++++++++++++++ .../main/resources/mapper/AlarmMgeMapper.xml | 2 +- .../mapper/TowerAssInspectMapper.xml | 54 ++++++++++++ .../base/controller/SelectController.java | 7 ++ .../system/base/mapper/ISelectMapper.java | 2 + .../system/base/service/ISelectService.java | 10 +++ .../base/service/impl/SelectServiceImpl.java | 11 +++ .../resources/mapper/base/SelectMapper.xml | 5 ++ 13 files changed, 362 insertions(+), 1 deletion(-) create mode 100644 securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/TowerAssInspectDto.java create mode 100644 securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/TowerAssInspectVo.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/TowerAssInspectServiceImpl.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/TowerAssInspectMapper.xml diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/TowerAssInspectDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/TowerAssInspectDto.java new file mode 100644 index 0000000..7820d4d --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/TowerAssInspectDto.java @@ -0,0 +1,17 @@ +package com.securitycontrol.entity.screen.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author lsun + */ +@Data +public class TowerAssInspectDto extends ScreenDto { + + @ApiModelProperty("杆塔id") + private String gtId; + + @ApiModelProperty("设备id") + private String deviceId; +} diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/TowerAssInspectVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/TowerAssInspectVo.java new file mode 100644 index 0000000..3f8431a --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/TowerAssInspectVo.java @@ -0,0 +1,46 @@ +package com.securitycontrol.entity.screen.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author lsun + */ +@Data +public class TowerAssInspectVo { + @ApiModelProperty("设备id") + private String deviceId; + @ApiModelProperty("设备名称") + private String deviceName; + @ApiModelProperty("设备类别") + private String type; + + @ApiModelProperty("实时检测类别") + private String dataType; + @ApiModelProperty("采集值") + private String val; + + @ApiModelProperty("告警内容") + private String warnContent; + @ApiModelProperty("预警时间") + private String warnTime; + + @ApiModelProperty("区域名称") + private String areaName; + + @ApiModelProperty("检测点名称") + private String modeName; + + @ApiModelProperty("本次变化值") + private String thisChangeVal; + + @ApiModelProperty("累计变化值") + private String changeVal; + + @ApiModelProperty("检测时间") + private String updateTime; + + @ApiModelProperty("状态") + private String isWarn; + +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/TowerAssInspectController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/TowerAssInspectController.java index fbe9cab..7463680 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/TowerAssInspectController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/TowerAssInspectController.java @@ -1,10 +1,98 @@ package com.securitycontrol.screen.controller; import com.securitycontrol.common.core.web.controller.BaseController; +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.screen.dto.TowerAssInspectDto; +import com.securitycontrol.entity.screen.vo.AlarmMgeVo; +import com.securitycontrol.entity.screen.vo.TowerAssInspectVo; +import com.securitycontrol.screen.service.TowerAssInspectService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +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 java.util.ArrayList; +import java.util.List; /** * @author lsun * 组塔检测 */ +@RestController +@RequestMapping("/largeScreen/towerAssInspect/") +@Slf4j public class TowerAssInspectController extends BaseController { + + @Resource(name = "TowerAssInspectService") + private TowerAssInspectService service; + + /** + * 设备列表 + * @param dto + * @return + */ + @ApiOperation(value = "设备列表") + @GetMapping("getDeviceList") + @Log(title = "组塔检测", menu = "组塔检测->设备列表", grade = OperationType.QUERY_BUSINESS, details = "查询设备列表", type = "业务日志") + public AjaxResult getDeviceList(TowerAssInspectDto dto) { + return service.getDeviceList(dto); + } + + /** + * 实时检测 + * @param dto + * @return + */ + @ApiOperation(value = "实时检测") + @GetMapping("getRealTimeDetection ") + @Log(title = "组塔检测", menu = "组塔检测->实时检测", grade = OperationType.QUERY_BUSINESS, details = "查询实时检测", type = "业务日志") + public AjaxResult getRealTimeDetection(TowerAssInspectDto dto) { + return service.getRealTimeDetection(dto); + } + + /** + * 当日检测变化趋势 + * @param dto + * @return + */ + @ApiOperation(value = "当日检测变化趋势") + @GetMapping("getTrend ") + @Log(title = "组塔检测", menu = "组塔检测->当日检测变化趋势", grade = OperationType.QUERY_BUSINESS, details = "查询当日检测变化趋势", type = "业务日志") + public AjaxResult getTrend(TowerAssInspectDto dto) { + return service.getTrend(dto); + } + + @ApiOperation(value = "实时告警") + @GetMapping("getRealTimeAlarmList") + @Log(title = "实时告警", menu = "告警管理->实时告警", grade = OperationType.QUERY_BUSINESS, details = "查询实时告警列表", type = "业务日志") + public TableDataInfo getRealTimeAlarmList(TowerAssInspectDto dto) { + try{ + startLayPage(); + List list = service.getRealTimeAlarmList(dto); + return getDataTableLayui(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBadLayui(new ArrayList<>(),"请求出错了"); + } + } + + @ApiOperation(value = "历史记录") + @GetMapping("getHistoryList") + @Log(title = "历史记录", menu = "告警管理->历史记录", grade = OperationType.QUERY_BUSINESS, details = "查询历史记录列表", type = "业务日志") + public TableDataInfo getHistoryList(TowerAssInspectDto 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/mapper/TowerAssInspectMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/TowerAssInspectMapper.java index f9d9ad0..dfbcaaa 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/TowerAssInspectMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/TowerAssInspectMapper.java @@ -1,8 +1,24 @@ package com.securitycontrol.screen.mapper; +import com.securitycontrol.entity.screen.dto.TowerAssInspectDto; +import com.securitycontrol.entity.screen.vo.TowerAssInspectVo; +import org.springframework.stereotype.Repository; + +import java.util.List; + /** * @author lsun * 组塔检测 */ +@Repository(value = "TowerAssInspectMapper") public interface TowerAssInspectMapper { + List getDeviceList(TowerAssInspectDto dto); + + List getRealTimeDetection(TowerAssInspectDto dto); + + List getTrend(TowerAssInspectDto dto); + + List getRealTimeAlarmList(TowerAssInspectDto dto); + + List getHistoryList(TowerAssInspectDto dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/TowerAssInspectService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/TowerAssInspectService.java index 949731c..fea19c2 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/TowerAssInspectService.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/TowerAssInspectService.java @@ -1,8 +1,25 @@ package com.securitycontrol.screen.service; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.screen.dto.TowerAssInspectDto; +import com.securitycontrol.entity.screen.vo.TowerAssInspectVo; +import com.securitycontrol.entity.screen.vo.AlarmMgeVo; + +import java.util.List; + /** * @author lsun * 组塔检测 */ public interface TowerAssInspectService { + + AjaxResult getDeviceList(TowerAssInspectDto dto); + + AjaxResult getRealTimeDetection(TowerAssInspectDto dto); + + AjaxResult getTrend(TowerAssInspectDto dto); + + List getRealTimeAlarmList(TowerAssInspectDto dto); + + List getHistoryList(TowerAssInspectDto dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/TowerAssInspectServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/TowerAssInspectServiceImpl.java new file mode 100644 index 0000000..4436830 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/TowerAssInspectServiceImpl.java @@ -0,0 +1,88 @@ +package com.securitycontrol.screen.service.impl; + +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.screen.dto.TowerAssInspectDto; +import com.securitycontrol.entity.screen.vo.AlarmMgeVo; +import com.securitycontrol.entity.screen.vo.TowerAssInspectVo; +import com.securitycontrol.entity.system.TreeBuild; +import com.securitycontrol.entity.system.vo.TreeNode; +import com.securitycontrol.screen.mapper.TowerAssInspectMapper; +import com.securitycontrol.screen.service.TowerAssInspectService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @author lsun + * 组塔检测 + */ +@Slf4j +@Service(value = "TowerAssInspectService") +public class TowerAssInspectServiceImpl implements TowerAssInspectService { + @Resource(name = "TowerAssInspectMapper") + private TowerAssInspectMapper mapper; + + /** + * 设备列表 + * @param dto + * @return + */ + @Override + public AjaxResult getDeviceList(TowerAssInspectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getDeviceList(dto); + } catch (Exception e) { + log.error("设备列表-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getRealTimeDetection(TowerAssInspectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getRealTimeDetection(dto); + } catch (Exception e) { + log.error("实时检测-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getTrend(TowerAssInspectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getTrend(dto); + } catch (Exception e) { + log.error("当日检测变化趋势-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public List getRealTimeAlarmList(TowerAssInspectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getRealTimeAlarmList(dto); + } catch (Exception e) { + log.error("获取实时告警列表",e); + } + return list; + } + + @Override + public List getHistoryList(TowerAssInspectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getHistoryList(dto); + } catch (Exception e) { + log.error("获取历史记录列表",e); + } + return list; + } +} 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 4955731..3077a7c 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml @@ -4,7 +4,7 @@ + SELECT tbd.device_id as deviceId,tbd.device_name as deviceName, + CASE + WHEN tbd.`status` = '1' AND tdv.is_warn = '1' THEN '2' + WHEN tbd.`status` = '1' AND tdv.is_warn = '0' THEN '1' + WHEN tbd.`status` = '0' THEN '0' + END type + FROM t_pro_gt tpg + LEFT JOIN tb_bd_device tbd ON tpg.gt_id = tbd.gt_id + 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 tpg.gt_id = #{gtId} + + + + + + + + + + + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java index 03c9c57..b2787ec 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java @@ -62,6 +62,13 @@ public class SelectController extends BaseController { return service.getBuildLists(); } + + @ApiOperation(value = "杆塔表下拉选") + @GetMapping("getGtLists") + public AjaxResult getGtLists(String bidCode) { + return service.getGtLists(bidCode); + } + @ApiOperation(value = "字典集合下拉选") @GetMapping("getDictLists") public AjaxResult getDictLists(SelectDto dto) { diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java index 08d5469..19162f0 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java @@ -139,4 +139,6 @@ public interface ISelectMapper { List getProList(SelectDto dto); List getSelectLists(); + + List getGtLists(@Param("bidCode") String bidCode); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java index c8d0e87..db3f1be 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java @@ -141,5 +141,15 @@ public interface ISelectService { */ AjaxResult getProList(SelectDto dto); + /** + * 建管单位下拉选 + * @return + */ AjaxResult getSelectLists(); + + /** + * 杆塔表下拉选 + * @return + */ + AjaxResult getGtLists(String bidCode); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java index f69fff6..183ef85 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java @@ -205,6 +205,17 @@ public class SelectServiceImpl implements ISelectService { return AjaxResult.success(list); } + @Override + public AjaxResult getGtLists(String bidCode) { + List list = new ArrayList<>(); + try { + list = mapper.getGtLists(bidCode); + } catch (Exception e) { + log.error("杆塔表下拉选",e); + } + return AjaxResult.success(list); + } + @Override public AjaxResult getBdLists(SelectDto dto) { diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml index 7cec034..c0988ee 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml @@ -138,4 +138,9 @@ WHERE sd.dict_code = '999' AND sd.del_flag = 0 ORDER BY sd2.dict_sort + + \ No newline at end of file From 3a489ac064bfecf93fc9c058f6d26201a24fa262 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 29 Mar 2024 16:26:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AppServiceImpl.java | 64 ++++++++++++++----- .../src/main/resources/mapper/AppMapper.xml | 3 +- 2 files changed, 49 insertions(+), 18 deletions(-) diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java index 6121b3b..f010cf9 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java @@ -49,25 +49,27 @@ public class AppServiceImpl implements IAppService { ProVo proVo = new ProVo(); try { proVo = mapper.getProBrief(dto); - List list = new ArrayList<>(); - List resourceFileVos = mapper.getFiles(proVo.getProId()); - if (CollectionUtils.isNotEmpty(resourceFileVos)) { - for (ResourceFileVo fileVo : resourceFileVos) { - String base64 = null; - Result result = remoteFileService.getImgBase64(fileVo.getFileId(), SecurityConstants.INNER); - if (result != null && result.getCode() == HttpStatus.SUCCESS && result.getData() != null) { - String jsonString = JSON.toJSONString(result.getData()); - JSONObject item = JSON.parseObject(jsonString); - base64 = item.getString("url"); + if(Objects.nonNull(proVo)){ + List list = new ArrayList<>(); + List resourceFileVos = mapper.getFiles(proVo.getProId()); + if (CollectionUtils.isNotEmpty(resourceFileVos)) { + for (ResourceFileVo fileVo : resourceFileVos) { + String base64 = null; + Result result = remoteFileService.getImgBase64(fileVo.getFileId(), SecurityConstants.INNER); + if (result != null && result.getCode() == HttpStatus.SUCCESS && result.getData() != null) { + String jsonString = JSON.toJSONString(result.getData()); + JSONObject item = JSON.parseObject(jsonString); + base64 = item.getString("url"); + } + ProVo.FileData fileData = new ProVo.FileData(); + fileData.setFileId(fileVo.getFileId()); + fileData.setBase64Url(base64); + fileData.setFileSourceType(fileVo.getSourceType()); + list.add(fileData); } - ProVo.FileData fileData = new ProVo.FileData(); - fileData.setFileId(fileVo.getFileId()); - fileData.setBase64Url(base64); - fileData.setFileSourceType(fileVo.getSourceType()); - list.add(fileData); } + proVo.setFileData(list); } - proVo.setFileData(list); } catch (Exception e) { log.error("工程简介", e); } @@ -223,7 +225,35 @@ public class AppServiceImpl implements IAppService { } dataMap.put("vo",vo); dataMap.put("item",item); - dataMap.put("proGxPlanList",proGxPlanList); + dataMap.put("proGxPlan",proGxPlanList); + dataMap.put("proCost",getProCostData()); return AjaxResult.success(dataMap); } + + public Map getProCostData(){ + Map dataMap = new HashMap<>(16); + dataMap.put("planCost","1200.0"); + dataMap.put("expenditureCost","523.4"); + dataMap.put("residueCost","676.6"); + List> proCostList = new ArrayList<>(); + for (int i = 0; i < Constant.CELL_3; i++) { + Map map = new HashMap<>(3); + if(i == 0){ + map.put("expenditureDate","2024-03-05"); + map.put("expenditure","设备购买"); + map.put("amount","200.1"); + }else if(i == 1){ + map.put("expenditureDate","2024-03-12"); + map.put("expenditure","工人工资"); + map.put("amount","23.3"); + }else if(i == 2){ + map.put("expenditureDate","2024-03-15"); + map.put("expenditure","设备安装"); + map.put("amount","300.0"); + } + proCostList.add(map); + } + dataMap.put("proCostPlanList",proCostList); + return dataMap; + } } diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml index 456af75..adf6297 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml @@ -15,7 +15,8 @@ tp.jl_unit AS jlUnit, tp.sg_unit AS sgUnit, tp.pro_brief AS proBrief, - tp.pro_type AS proType + tp.pro_type AS proType, + tp.pro_cost AS proCost FROM tb_project tp LEFT JOIN sys_build sb ON tp.org = sb.org_id WHERE tp.bid_code = #{bidCode} AND del_flag = 0