diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java index 968d222..38e98ff 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java @@ -5,9 +5,11 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.service.ScreenDataService; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@RequestMapping("/whale/eye") public class ScreenDataController { private final ScreenDataService screenDataService; private final AbstractPermissionContext permissionService; @@ -17,8 +19,13 @@ this.permissionService = permissionService; } - @RequestMapping("/statistics/installed-device") + @RequestMapping("/installed-device") public Object getInstalledDevice(String beginTime, String endTime) { return screenDataService.getInstalledDevice(beginTime, endTime); } + + @RequestMapping("/alarm-rate") + public Object getKindsAlarmRate(String beginTime, String endTime) { + return screenDataService.getKindsAlarmRate(beginTime, endTime); + } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java index 968d222..38e98ff 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java @@ -5,9 +5,11 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.service.ScreenDataService; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@RequestMapping("/whale/eye") public class ScreenDataController { private final ScreenDataService screenDataService; private final AbstractPermissionContext permissionService; @@ -17,8 +19,13 @@ this.permissionService = permissionService; } - @RequestMapping("/statistics/installed-device") + @RequestMapping("/installed-device") public Object getInstalledDevice(String beginTime, String endTime) { return screenDataService.getInstalledDevice(beginTime, endTime); } + + @RequestMapping("/alarm-rate") + public Object getKindsAlarmRate(String beginTime, String endTime) { + return screenDataService.getKindsAlarmRate(beginTime, endTime); + } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java index 394b21f..29408cb 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java @@ -9,8 +9,8 @@ @Component public interface ScreenDataServiceMapper { - List> countDeviceByType(); + List> countDeviceByType(); - String getDeviceTypeById(@Param("deptid") Long deptId); + List> countAlarmType(); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java index 968d222..38e98ff 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java @@ -5,9 +5,11 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.service.ScreenDataService; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@RequestMapping("/whale/eye") public class ScreenDataController { private final ScreenDataService screenDataService; private final AbstractPermissionContext permissionService; @@ -17,8 +19,13 @@ this.permissionService = permissionService; } - @RequestMapping("/statistics/installed-device") + @RequestMapping("/installed-device") public Object getInstalledDevice(String beginTime, String endTime) { return screenDataService.getInstalledDevice(beginTime, endTime); } + + @RequestMapping("/alarm-rate") + public Object getKindsAlarmRate(String beginTime, String endTime) { + return screenDataService.getKindsAlarmRate(beginTime, endTime); + } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java index 394b21f..29408cb 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java @@ -9,8 +9,8 @@ @Component public interface ScreenDataServiceMapper { - List> countDeviceByType(); + List> countDeviceByType(); - String getDeviceTypeById(@Param("deptid") Long deptId); + List> countAlarmType(); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml index 20b1df2..f6268d3 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml @@ -37,10 +37,11 @@ - + SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" + FROM alarm_records ar + INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE + GROUP BY bd.DEVICE_TYPE diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java index 968d222..38e98ff 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java @@ -5,9 +5,11 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.service.ScreenDataService; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@RequestMapping("/whale/eye") public class ScreenDataController { private final ScreenDataService screenDataService; private final AbstractPermissionContext permissionService; @@ -17,8 +19,13 @@ this.permissionService = permissionService; } - @RequestMapping("/statistics/installed-device") + @RequestMapping("/installed-device") public Object getInstalledDevice(String beginTime, String endTime) { return screenDataService.getInstalledDevice(beginTime, endTime); } + + @RequestMapping("/alarm-rate") + public Object getKindsAlarmRate(String beginTime, String endTime) { + return screenDataService.getKindsAlarmRate(beginTime, endTime); + } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java index 394b21f..29408cb 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java @@ -9,8 +9,8 @@ @Component public interface ScreenDataServiceMapper { - List> countDeviceByType(); + List> countDeviceByType(); - String getDeviceTypeById(@Param("deptid") Long deptId); + List> countAlarmType(); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml index 20b1df2..f6268d3 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml @@ -37,10 +37,11 @@ - + SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" + FROM alarm_records ar + INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE + GROUP BY bd.DEVICE_TYPE diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java index 8469cc1..db1f830 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java @@ -4,4 +4,7 @@ public interface ScreenDataService { ResponseData getInstalledDevice(String beginTime, String endTime); + + ResponseData getKindsAlarmRate(String beginTime, String endTime); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java index 968d222..38e98ff 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java @@ -5,9 +5,11 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.service.ScreenDataService; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@RequestMapping("/whale/eye") public class ScreenDataController { private final ScreenDataService screenDataService; private final AbstractPermissionContext permissionService; @@ -17,8 +19,13 @@ this.permissionService = permissionService; } - @RequestMapping("/statistics/installed-device") + @RequestMapping("/installed-device") public Object getInstalledDevice(String beginTime, String endTime) { return screenDataService.getInstalledDevice(beginTime, endTime); } + + @RequestMapping("/alarm-rate") + public Object getKindsAlarmRate(String beginTime, String endTime) { + return screenDataService.getKindsAlarmRate(beginTime, endTime); + } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java index 394b21f..29408cb 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java @@ -9,8 +9,8 @@ @Component public interface ScreenDataServiceMapper { - List> countDeviceByType(); + List> countDeviceByType(); - String getDeviceTypeById(@Param("deptid") Long deptId); + List> countAlarmType(); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml index 20b1df2..f6268d3 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml @@ -37,10 +37,11 @@ - + SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" + FROM alarm_records ar + INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE + GROUP BY bd.DEVICE_TYPE diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java index 8469cc1..db1f830 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java @@ -4,4 +4,7 @@ public interface ScreenDataService { ResponseData getInstalledDevice(String beginTime, String endTime); + + ResponseData getKindsAlarmRate(String beginTime, String endTime); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java index 24d139c..bcf14b3 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.service.impl; -import com.alibaba.fastjson.JSON; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.ScreenDataServiceMapper; @@ -10,11 +9,8 @@ import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import java.text.DecimalFormat; +import java.util.*; @Slf4j @Service @@ -25,6 +21,8 @@ private final AbstractPermissionContext permissionService; + private final DecimalFormat df = new DecimalFormat("0.00%"); + public ScreenDataServiceImpl(ScreenDataServiceMapper screenDataServiceMapper, AbstractPermissionContext permissionService) { this.screenDataServiceMapper = screenDataServiceMapper; this.permissionService = permissionService; @@ -45,21 +43,65 @@ return responseData; } + + public ResponseData getKindsAlarmRate(String beginTime, String endTime) { + ResponseData responseData = new ResponseData(); + try { + List> rateDeviceList = countTypeAlarm(); + responseData.setData(rateDeviceList); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + private List> initInstalledDevice() { - Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();//根绝当前角色获取所在部门 - String deviceTypes = screenDataServiceMapper.getDeviceTypeById(deptId); List> installedDeviceList = new ArrayList<>(); List> deviceCountList = screenDataServiceMapper.countDeviceByType(); - Map deviceCountMap = deviceCountList.stream().collect( - Collectors.toMap(e -> String.valueOf(e.get("deviceType")), e -> String.valueOf(e.get("count")))); - for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) { - Map installedDeviceMap = new HashMap<>(); - installedDeviceMap.put("count", deviceCountMap.get(deviceType)); - installedDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). - get(Integer.valueOf(deviceType.toString())).getTypeName()); - installedDeviceList.add(installedDeviceMap); - } +// Map deviceCountMap = deviceCountList.stream().collect( +// Collectors.toMap(e -> String.valueOf(e.get("deviceType")), e -> String.valueOf(e.get("count")))); + deviceCountList.forEach( + deviceCountMap -> { + Map installedDeviceMap = new HashMap<>(); + installedDeviceMap.put("count", deviceCountMap.get("deviceType")); + installedDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). + get(Integer.valueOf(String.valueOf(deviceCountMap.get("deviceType")))).getTypeName()); + installedDeviceList.add(installedDeviceMap); + } + ); return installedDeviceList; } + private List> countTypeAlarm() { + List> rateDeviceList = new ArrayList<>(); + List> deviceCountList = screenDataServiceMapper.countDeviceByType(); + Integer totalAlarm = 0; + for (Map deviceCount : deviceCountList) { + totalAlarm += Integer.valueOf(deviceCount.get("count").toString()); + } +// Map deviceCountMap = deviceCountList.stream().collect( +// Collectors.toMap(e -> String.valueOf(e.get("deviceType")), e -> String.valueOf(e.get("count")))); +// deviceCountList.forEach( + for (Map deviceCountMap : deviceCountList) { + Map rateDeviceMap = new HashMap<>(); + rateDeviceMap.put("rate", df.format(Double.valueOf(deviceCountMap.get("deviceType") == null ? "0" : deviceCountMap.get("deviceType").toString()) / totalAlarm)); + rateDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). + get(Integer.valueOf(deviceCountMap.get("deviceType").toString())).getTypeName()); + rateDeviceList.add(rateDeviceMap); + } ; +// for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) { +// Map rateDeviceMap = new HashMap<>(); +// rateDeviceMap.put("rate", df.format(Double.valueOf(deviceCountMap.get(deviceType) == null ? "0" : deviceCountMap.get(deviceType)) / totalAlarm)); +// rateDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). +// get(Integer.valueOf(deviceType.toString())).getTypeName()); +// rateDeviceList.add(rateDeviceMap); +// } + return rateDeviceList; + } + + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java index 968d222..38e98ff 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java @@ -5,9 +5,11 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.service.ScreenDataService; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@RequestMapping("/whale/eye") public class ScreenDataController { private final ScreenDataService screenDataService; private final AbstractPermissionContext permissionService; @@ -17,8 +19,13 @@ this.permissionService = permissionService; } - @RequestMapping("/statistics/installed-device") + @RequestMapping("/installed-device") public Object getInstalledDevice(String beginTime, String endTime) { return screenDataService.getInstalledDevice(beginTime, endTime); } + + @RequestMapping("/alarm-rate") + public Object getKindsAlarmRate(String beginTime, String endTime) { + return screenDataService.getKindsAlarmRate(beginTime, endTime); + } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java index 394b21f..29408cb 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java @@ -9,8 +9,8 @@ @Component public interface ScreenDataServiceMapper { - List> countDeviceByType(); + List> countDeviceByType(); - String getDeviceTypeById(@Param("deptid") Long deptId); + List> countAlarmType(); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml index 20b1df2..f6268d3 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml @@ -37,10 +37,11 @@ - + SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" + FROM alarm_records ar + INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE + GROUP BY bd.DEVICE_TYPE diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java index 8469cc1..db1f830 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java @@ -4,4 +4,7 @@ public interface ScreenDataService { ResponseData getInstalledDevice(String beginTime, String endTime); + + ResponseData getKindsAlarmRate(String beginTime, String endTime); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java index 24d139c..bcf14b3 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.service.impl; -import com.alibaba.fastjson.JSON; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.ScreenDataServiceMapper; @@ -10,11 +9,8 @@ import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import java.text.DecimalFormat; +import java.util.*; @Slf4j @Service @@ -25,6 +21,8 @@ private final AbstractPermissionContext permissionService; + private final DecimalFormat df = new DecimalFormat("0.00%"); + public ScreenDataServiceImpl(ScreenDataServiceMapper screenDataServiceMapper, AbstractPermissionContext permissionService) { this.screenDataServiceMapper = screenDataServiceMapper; this.permissionService = permissionService; @@ -45,21 +43,65 @@ return responseData; } + + public ResponseData getKindsAlarmRate(String beginTime, String endTime) { + ResponseData responseData = new ResponseData(); + try { + List> rateDeviceList = countTypeAlarm(); + responseData.setData(rateDeviceList); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + private List> initInstalledDevice() { - Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();//根绝当前角色获取所在部门 - String deviceTypes = screenDataServiceMapper.getDeviceTypeById(deptId); List> installedDeviceList = new ArrayList<>(); List> deviceCountList = screenDataServiceMapper.countDeviceByType(); - Map deviceCountMap = deviceCountList.stream().collect( - Collectors.toMap(e -> String.valueOf(e.get("deviceType")), e -> String.valueOf(e.get("count")))); - for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) { - Map installedDeviceMap = new HashMap<>(); - installedDeviceMap.put("count", deviceCountMap.get(deviceType)); - installedDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). - get(Integer.valueOf(deviceType.toString())).getTypeName()); - installedDeviceList.add(installedDeviceMap); - } +// Map deviceCountMap = deviceCountList.stream().collect( +// Collectors.toMap(e -> String.valueOf(e.get("deviceType")), e -> String.valueOf(e.get("count")))); + deviceCountList.forEach( + deviceCountMap -> { + Map installedDeviceMap = new HashMap<>(); + installedDeviceMap.put("count", deviceCountMap.get("deviceType")); + installedDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). + get(Integer.valueOf(String.valueOf(deviceCountMap.get("deviceType")))).getTypeName()); + installedDeviceList.add(installedDeviceMap); + } + ); return installedDeviceList; } + private List> countTypeAlarm() { + List> rateDeviceList = new ArrayList<>(); + List> deviceCountList = screenDataServiceMapper.countDeviceByType(); + Integer totalAlarm = 0; + for (Map deviceCount : deviceCountList) { + totalAlarm += Integer.valueOf(deviceCount.get("count").toString()); + } +// Map deviceCountMap = deviceCountList.stream().collect( +// Collectors.toMap(e -> String.valueOf(e.get("deviceType")), e -> String.valueOf(e.get("count")))); +// deviceCountList.forEach( + for (Map deviceCountMap : deviceCountList) { + Map rateDeviceMap = new HashMap<>(); + rateDeviceMap.put("rate", df.format(Double.valueOf(deviceCountMap.get("deviceType") == null ? "0" : deviceCountMap.get("deviceType").toString()) / totalAlarm)); + rateDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). + get(Integer.valueOf(deviceCountMap.get("deviceType").toString())).getTypeName()); + rateDeviceList.add(rateDeviceMap); + } ; +// for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) { +// Map rateDeviceMap = new HashMap<>(); +// rateDeviceMap.put("rate", df.format(Double.valueOf(deviceCountMap.get(deviceType) == null ? "0" : deviceCountMap.get(deviceType)) / totalAlarm)); +// rateDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). +// get(Integer.valueOf(deviceType.toString())).getTypeName()); +// rateDeviceList.add(rateDeviceMap); +// } + return rateDeviceList; + } + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 12763f9..8b147d2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java index 968d222..38e98ff 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java @@ -5,9 +5,11 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.service.ScreenDataService; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@RequestMapping("/whale/eye") public class ScreenDataController { private final ScreenDataService screenDataService; private final AbstractPermissionContext permissionService; @@ -17,8 +19,13 @@ this.permissionService = permissionService; } - @RequestMapping("/statistics/installed-device") + @RequestMapping("/installed-device") public Object getInstalledDevice(String beginTime, String endTime) { return screenDataService.getInstalledDevice(beginTime, endTime); } + + @RequestMapping("/alarm-rate") + public Object getKindsAlarmRate(String beginTime, String endTime) { + return screenDataService.getKindsAlarmRate(beginTime, endTime); + } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java index 394b21f..29408cb 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java @@ -9,8 +9,8 @@ @Component public interface ScreenDataServiceMapper { - List> countDeviceByType(); + List> countDeviceByType(); - String getDeviceTypeById(@Param("deptid") Long deptId); + List> countAlarmType(); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml index 20b1df2..f6268d3 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml @@ -37,10 +37,11 @@ - + SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" + FROM alarm_records ar + INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE + GROUP BY bd.DEVICE_TYPE diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java index 8469cc1..db1f830 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java @@ -4,4 +4,7 @@ public interface ScreenDataService { ResponseData getInstalledDevice(String beginTime, String endTime); + + ResponseData getKindsAlarmRate(String beginTime, String endTime); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java index 24d139c..bcf14b3 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.service.impl; -import com.alibaba.fastjson.JSON; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.ScreenDataServiceMapper; @@ -10,11 +9,8 @@ import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import java.text.DecimalFormat; +import java.util.*; @Slf4j @Service @@ -25,6 +21,8 @@ private final AbstractPermissionContext permissionService; + private final DecimalFormat df = new DecimalFormat("0.00%"); + public ScreenDataServiceImpl(ScreenDataServiceMapper screenDataServiceMapper, AbstractPermissionContext permissionService) { this.screenDataServiceMapper = screenDataServiceMapper; this.permissionService = permissionService; @@ -45,21 +43,65 @@ return responseData; } + + public ResponseData getKindsAlarmRate(String beginTime, String endTime) { + ResponseData responseData = new ResponseData(); + try { + List> rateDeviceList = countTypeAlarm(); + responseData.setData(rateDeviceList); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + private List> initInstalledDevice() { - Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();//根绝当前角色获取所在部门 - String deviceTypes = screenDataServiceMapper.getDeviceTypeById(deptId); List> installedDeviceList = new ArrayList<>(); List> deviceCountList = screenDataServiceMapper.countDeviceByType(); - Map deviceCountMap = deviceCountList.stream().collect( - Collectors.toMap(e -> String.valueOf(e.get("deviceType")), e -> String.valueOf(e.get("count")))); - for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) { - Map installedDeviceMap = new HashMap<>(); - installedDeviceMap.put("count", deviceCountMap.get(deviceType)); - installedDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). - get(Integer.valueOf(deviceType.toString())).getTypeName()); - installedDeviceList.add(installedDeviceMap); - } +// Map deviceCountMap = deviceCountList.stream().collect( +// Collectors.toMap(e -> String.valueOf(e.get("deviceType")), e -> String.valueOf(e.get("count")))); + deviceCountList.forEach( + deviceCountMap -> { + Map installedDeviceMap = new HashMap<>(); + installedDeviceMap.put("count", deviceCountMap.get("deviceType")); + installedDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). + get(Integer.valueOf(String.valueOf(deviceCountMap.get("deviceType")))).getTypeName()); + installedDeviceList.add(installedDeviceMap); + } + ); return installedDeviceList; } + private List> countTypeAlarm() { + List> rateDeviceList = new ArrayList<>(); + List> deviceCountList = screenDataServiceMapper.countDeviceByType(); + Integer totalAlarm = 0; + for (Map deviceCount : deviceCountList) { + totalAlarm += Integer.valueOf(deviceCount.get("count").toString()); + } +// Map deviceCountMap = deviceCountList.stream().collect( +// Collectors.toMap(e -> String.valueOf(e.get("deviceType")), e -> String.valueOf(e.get("count")))); +// deviceCountList.forEach( + for (Map deviceCountMap : deviceCountList) { + Map rateDeviceMap = new HashMap<>(); + rateDeviceMap.put("rate", df.format(Double.valueOf(deviceCountMap.get("deviceType") == null ? "0" : deviceCountMap.get("deviceType").toString()) / totalAlarm)); + rateDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). + get(Integer.valueOf(deviceCountMap.get("deviceType").toString())).getTypeName()); + rateDeviceList.add(rateDeviceMap); + } ; +// for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) { +// Map rateDeviceMap = new HashMap<>(); +// rateDeviceMap.put("rate", df.format(Double.valueOf(deviceCountMap.get(deviceType) == null ? "0" : deviceCountMap.get(deviceType)) / totalAlarm)); +// rateDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). +// get(Integer.valueOf(deviceType.toString())).getTypeName()); +// rateDeviceList.add(rateDeviceMap); +// } + return rateDeviceList; + } + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 12763f9..8b147d2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index b0f345b..e68c8ab 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -37,7 +37,7 @@ /** * 主键 */ - @TableId(value = "ID", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 井盖编号 diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java index 968d222..38e98ff 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ScreenDataController.java @@ -5,9 +5,11 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.service.ScreenDataService; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@RequestMapping("/whale/eye") public class ScreenDataController { private final ScreenDataService screenDataService; private final AbstractPermissionContext permissionService; @@ -17,8 +19,13 @@ this.permissionService = permissionService; } - @RequestMapping("/statistics/installed-device") + @RequestMapping("/installed-device") public Object getInstalledDevice(String beginTime, String endTime) { return screenDataService.getInstalledDevice(beginTime, endTime); } + + @RequestMapping("/alarm-rate") + public Object getKindsAlarmRate(String beginTime, String endTime) { + return screenDataService.getKindsAlarmRate(beginTime, endTime); + } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java index 394b21f..29408cb 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ScreenDataServiceMapper.java @@ -9,8 +9,8 @@ @Component public interface ScreenDataServiceMapper { - List> countDeviceByType(); + List> countDeviceByType(); - String getDeviceTypeById(@Param("deptid") Long deptId); + List> countAlarmType(); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml index 20b1df2..f6268d3 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ScreenDataServiceMapper.xml @@ -37,10 +37,11 @@ - + SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" + FROM alarm_records ar + INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE + GROUP BY bd.DEVICE_TYPE diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java index 8469cc1..db1f830 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java @@ -4,4 +4,7 @@ public interface ScreenDataService { ResponseData getInstalledDevice(String beginTime, String endTime); + + ResponseData getKindsAlarmRate(String beginTime, String endTime); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java index 24d139c..bcf14b3 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.service.impl; -import com.alibaba.fastjson.JSON; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.ScreenDataServiceMapper; @@ -10,11 +9,8 @@ import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import java.text.DecimalFormat; +import java.util.*; @Slf4j @Service @@ -25,6 +21,8 @@ private final AbstractPermissionContext permissionService; + private final DecimalFormat df = new DecimalFormat("0.00%"); + public ScreenDataServiceImpl(ScreenDataServiceMapper screenDataServiceMapper, AbstractPermissionContext permissionService) { this.screenDataServiceMapper = screenDataServiceMapper; this.permissionService = permissionService; @@ -45,21 +43,65 @@ return responseData; } + + public ResponseData getKindsAlarmRate(String beginTime, String endTime) { + ResponseData responseData = new ResponseData(); + try { + List> rateDeviceList = countTypeAlarm(); + responseData.setData(rateDeviceList); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + private List> initInstalledDevice() { - Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();//根绝当前角色获取所在部门 - String deviceTypes = screenDataServiceMapper.getDeviceTypeById(deptId); List> installedDeviceList = new ArrayList<>(); List> deviceCountList = screenDataServiceMapper.countDeviceByType(); - Map deviceCountMap = deviceCountList.stream().collect( - Collectors.toMap(e -> String.valueOf(e.get("deviceType")), e -> String.valueOf(e.get("count")))); - for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) { - Map installedDeviceMap = new HashMap<>(); - installedDeviceMap.put("count", deviceCountMap.get(deviceType)); - installedDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). - get(Integer.valueOf(deviceType.toString())).getTypeName()); - installedDeviceList.add(installedDeviceMap); - } +// Map deviceCountMap = deviceCountList.stream().collect( +// Collectors.toMap(e -> String.valueOf(e.get("deviceType")), e -> String.valueOf(e.get("count")))); + deviceCountList.forEach( + deviceCountMap -> { + Map installedDeviceMap = new HashMap<>(); + installedDeviceMap.put("count", deviceCountMap.get("deviceType")); + installedDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). + get(Integer.valueOf(String.valueOf(deviceCountMap.get("deviceType")))).getTypeName()); + installedDeviceList.add(installedDeviceMap); + } + ); return installedDeviceList; } + private List> countTypeAlarm() { + List> rateDeviceList = new ArrayList<>(); + List> deviceCountList = screenDataServiceMapper.countDeviceByType(); + Integer totalAlarm = 0; + for (Map deviceCount : deviceCountList) { + totalAlarm += Integer.valueOf(deviceCount.get("count").toString()); + } +// Map deviceCountMap = deviceCountList.stream().collect( +// Collectors.toMap(e -> String.valueOf(e.get("deviceType")), e -> String.valueOf(e.get("count")))); +// deviceCountList.forEach( + for (Map deviceCountMap : deviceCountList) { + Map rateDeviceMap = new HashMap<>(); + rateDeviceMap.put("rate", df.format(Double.valueOf(deviceCountMap.get("deviceType") == null ? "0" : deviceCountMap.get("deviceType").toString()) / totalAlarm)); + rateDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). + get(Integer.valueOf(deviceCountMap.get("deviceType").toString())).getTypeName()); + rateDeviceList.add(rateDeviceMap); + } ; +// for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) { +// Map rateDeviceMap = new HashMap<>(); +// rateDeviceMap.put("rate", df.format(Double.valueOf(deviceCountMap.get(deviceType) == null ? "0" : deviceCountMap.get(deviceType)) / totalAlarm)); +// rateDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap(). +// get(Integer.valueOf(deviceType.toString())).getTypeName()); +// rateDeviceList.add(rateDeviceMap); +// } + return rateDeviceList; + } + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 12763f9..8b147d2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index b0f345b..e68c8ab 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -37,7 +37,7 @@ /** * 主键 */ - @TableId(value = "ID", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 井盖编号 diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index 8c58c7d..bed957f 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -34,7 +34,7 @@ LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, - BFZT AS bfzt,RESPONSIBLE_DEPT AS "responsibleDept" + BFZT AS bfzt,RESPONSIBLE_DEPT AS "responsibleDept",ROAD AS road