diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java index e842023..09b8107 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java @@ -39,6 +39,7 @@ @RequestMapping("/overview") public class BusMapOverviewController extends BaseController { + @Resource private AbstractPermissionContext permissionService; @Resource diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java index e842023..09b8107 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java @@ -39,6 +39,7 @@ @RequestMapping("/overview") public class BusMapOverviewController extends BaseController { + @Resource private AbstractPermissionContext permissionService; @Resource diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java new file mode 100644 index 0000000..31adf46 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import com.casic.missiles.modular.system.service.BusMapOverviewGisService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/overviewGis") +@RequiredArgsConstructor +public class BusMapOverviewGisController extends BaseController { + + private final BusMapOverviewGisService busMapOverviewGisService; + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceList") + public Object deviceList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deviceType) { + List mapList = busMapOverviewGisService.deviceList(deviceType, keywords); + return ResponseData.success(mapList); + } + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceValue") + public Object deviceValue(@RequestParam(required = true) String code) { + DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code); + return ResponseData.success(deviceValue); + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java index e842023..09b8107 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java @@ -39,6 +39,7 @@ @RequestMapping("/overview") public class BusMapOverviewController extends BaseController { + @Resource private AbstractPermissionContext permissionService; @Resource diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java new file mode 100644 index 0000000..31adf46 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import com.casic.missiles.modular.system.service.BusMapOverviewGisService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/overviewGis") +@RequiredArgsConstructor +public class BusMapOverviewGisController extends BaseController { + + private final BusMapOverviewGisService busMapOverviewGisService; + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceList") + public Object deviceList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deviceType) { + List mapList = busMapOverviewGisService.deviceList(deviceType, keywords); + return ResponseData.success(mapList); + } + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceValue") + public Object deviceValue(@RequestParam(required = true) String code) { + DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code); + return ResponseData.success(deviceValue); + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 0cc1d6d..398a253 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.alibaba.druid.util.StringUtils; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -124,6 +125,10 @@ public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); + for (DataH2s dataH2s : mapList) { + dataH2s.setStrength(!StringUtils.isEmpty(dataH2s.getStrength()) && + Float.valueOf(dataH2s.getStrength()) >= 100 ? "浓度溢出" : dataH2s.getStrength()); + } return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java index e842023..09b8107 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java @@ -39,6 +39,7 @@ @RequestMapping("/overview") public class BusMapOverviewController extends BaseController { + @Resource private AbstractPermissionContext permissionService; @Resource diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java new file mode 100644 index 0000000..31adf46 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import com.casic.missiles.modular.system.service.BusMapOverviewGisService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/overviewGis") +@RequiredArgsConstructor +public class BusMapOverviewGisController extends BaseController { + + private final BusMapOverviewGisService busMapOverviewGisService; + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceList") + public Object deviceList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deviceType) { + List mapList = busMapOverviewGisService.deviceList(deviceType, keywords); + return ResponseData.success(mapList); + } + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceValue") + public Object deviceValue(@RequestParam(required = true) String code) { + DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code); + return ResponseData.success(deviceValue); + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 0cc1d6d..398a253 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.alibaba.druid.util.StringUtils; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -124,6 +125,10 @@ public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); + for (DataH2s dataH2s : mapList) { + dataH2s.setStrength(!StringUtils.isEmpty(dataH2s.getStrength()) && + Float.valueOf(dataH2s.getStrength()) >= 100 ? "浓度溢出" : dataH2s.getStrength()); + } return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java new file mode 100644 index 0000000..d47a3dc --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BusMapOverviewGisMapper { + + List deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords); + + DeviceValueMapVO deviceValue(@Param("devcode") String devcode); +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java index e842023..09b8107 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java @@ -39,6 +39,7 @@ @RequestMapping("/overview") public class BusMapOverviewController extends BaseController { + @Resource private AbstractPermissionContext permissionService; @Resource diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java new file mode 100644 index 0000000..31adf46 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import com.casic.missiles.modular.system.service.BusMapOverviewGisService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/overviewGis") +@RequiredArgsConstructor +public class BusMapOverviewGisController extends BaseController { + + private final BusMapOverviewGisService busMapOverviewGisService; + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceList") + public Object deviceList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deviceType) { + List mapList = busMapOverviewGisService.deviceList(deviceType, keywords); + return ResponseData.success(mapList); + } + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceValue") + public Object deviceValue(@RequestParam(required = true) String code) { + DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code); + return ResponseData.success(deviceValue); + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 0cc1d6d..398a253 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.alibaba.druid.util.StringUtils; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -124,6 +125,10 @@ public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); + for (DataH2s dataH2s : mapList) { + dataH2s.setStrength(!StringUtils.isEmpty(dataH2s.getStrength()) && + Float.valueOf(dataH2s.getStrength()) >= 100 ? "浓度溢出" : dataH2s.getStrength()); + } return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java new file mode 100644 index 0000000..d47a3dc --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BusMapOverviewGisMapper { + + List deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords); + + DeviceValueMapVO deviceValue(@Param("devcode") String devcode); +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml new file mode 100644 index 0000000..e4c3acf --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml @@ -0,0 +1,42 @@ + + + + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java index e842023..09b8107 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java @@ -39,6 +39,7 @@ @RequestMapping("/overview") public class BusMapOverviewController extends BaseController { + @Resource private AbstractPermissionContext permissionService; @Resource diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java new file mode 100644 index 0000000..31adf46 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import com.casic.missiles.modular.system.service.BusMapOverviewGisService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/overviewGis") +@RequiredArgsConstructor +public class BusMapOverviewGisController extends BaseController { + + private final BusMapOverviewGisService busMapOverviewGisService; + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceList") + public Object deviceList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deviceType) { + List mapList = busMapOverviewGisService.deviceList(deviceType, keywords); + return ResponseData.success(mapList); + } + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceValue") + public Object deviceValue(@RequestParam(required = true) String code) { + DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code); + return ResponseData.success(deviceValue); + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 0cc1d6d..398a253 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.alibaba.druid.util.StringUtils; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -124,6 +125,10 @@ public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); + for (DataH2s dataH2s : mapList) { + dataH2s.setStrength(!StringUtils.isEmpty(dataH2s.getStrength()) && + Float.valueOf(dataH2s.getStrength()) >= 100 ? "浓度溢出" : dataH2s.getStrength()); + } return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java new file mode 100644 index 0000000..d47a3dc --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BusMapOverviewGisMapper { + + List deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords); + + DeviceValueMapVO deviceValue(@Param("devcode") String devcode); +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml new file mode 100644 index 0000000..e4c3acf --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml @@ -0,0 +1,42 @@ + + + + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ + SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code", + position AS "location",onlineState AS "status" + FROM device_view dv + WHERE 1=1 + + AND deviceType=#{deviceType} + + + and (dv.DEVCODE like + + OR wellCode LIKE + + ) + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ + SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code", + position AS "location",onlineState AS "status" + FROM device_view dv + WHERE 1=1 + + AND deviceType=#{deviceType} + + + and (dv.DEVCODE like + + OR wellCode LIKE + + ) + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ + SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code", + position AS "location",onlineState AS "status" + FROM device_view dv + WHERE 1=1 + + AND deviceType=#{deviceType} + + + and (dv.DEVCODE like + + OR wellCode LIKE + + ) + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ + SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code", + position AS "location",onlineState AS "status" + FROM device_view dv + WHERE 1=1 + + AND deviceType=#{deviceType} + + + and (dv.DEVCODE like + + OR wellCode LIKE + + ) + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ + SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code", + position AS "location",onlineState AS "status" + FROM device_view dv + WHERE 1=1 + + AND deviceType=#{deviceType} + + + and (dv.DEVCODE like + + OR wellCode LIKE + + ) + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ + SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code", + position AS "location",onlineState AS "status" + FROM device_view dv + WHERE 1=1 + + AND deviceType=#{deviceType} + + + and (dv.DEVCODE like + + OR wellCode LIKE + + ) + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ - datediff(current_timestamp,install_date) + SYSDATE()-install_date @@ -303,7 +303,7 @@ - current_timestamp- Max(dt.logtime) + SYSDATE()- Max(dt.logtime) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java index e842023..09b8107 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java @@ -39,6 +39,7 @@ @RequestMapping("/overview") public class BusMapOverviewController extends BaseController { + @Resource private AbstractPermissionContext permissionService; @Resource diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java new file mode 100644 index 0000000..31adf46 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import com.casic.missiles.modular.system.service.BusMapOverviewGisService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/overviewGis") +@RequiredArgsConstructor +public class BusMapOverviewGisController extends BaseController { + + private final BusMapOverviewGisService busMapOverviewGisService; + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceList") + public Object deviceList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deviceType) { + List mapList = busMapOverviewGisService.deviceList(deviceType, keywords); + return ResponseData.success(mapList); + } + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceValue") + public Object deviceValue(@RequestParam(required = true) String code) { + DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code); + return ResponseData.success(deviceValue); + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 0cc1d6d..398a253 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.alibaba.druid.util.StringUtils; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -124,6 +125,10 @@ public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); + for (DataH2s dataH2s : mapList) { + dataH2s.setStrength(!StringUtils.isEmpty(dataH2s.getStrength()) && + Float.valueOf(dataH2s.getStrength()) >= 100 ? "浓度溢出" : dataH2s.getStrength()); + } return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java new file mode 100644 index 0000000..d47a3dc --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BusMapOverviewGisMapper { + + List deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords); + + DeviceValueMapVO deviceValue(@Param("devcode") String devcode); +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml new file mode 100644 index 0000000..e4c3acf --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml @@ -0,0 +1,42 @@ + + + + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ - datediff(current_timestamp,install_date) + SYSDATE()-install_date @@ -303,7 +303,7 @@ - current_timestamp- Max(dt.logtime) + SYSDATE()- Max(dt.logtime) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java index 2273504..298f039 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java @@ -16,9 +16,10 @@ commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0])); commConfigDTO.setInterval(Long.valueOf(content.split(",")[1])); commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",",5)[3])){ - commConfigDTO.setIp(content.split(",", 5)[3]); - commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4])); + if(StringUtils.isNotBlank(content.split(",",6)[3])){ + commConfigDTO.setIp(content.split(",", 6)[3]); + commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[4])); + commConfigDTO.setThresh(Float.valueOf(content.split(",", 6)[5])); } redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java index e842023..09b8107 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java @@ -39,6 +39,7 @@ @RequestMapping("/overview") public class BusMapOverviewController extends BaseController { + @Resource private AbstractPermissionContext permissionService; @Resource diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java new file mode 100644 index 0000000..31adf46 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import com.casic.missiles.modular.system.service.BusMapOverviewGisService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/overviewGis") +@RequiredArgsConstructor +public class BusMapOverviewGisController extends BaseController { + + private final BusMapOverviewGisService busMapOverviewGisService; + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceList") + public Object deviceList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deviceType) { + List mapList = busMapOverviewGisService.deviceList(deviceType, keywords); + return ResponseData.success(mapList); + } + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceValue") + public Object deviceValue(@RequestParam(required = true) String code) { + DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code); + return ResponseData.success(deviceValue); + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 0cc1d6d..398a253 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.alibaba.druid.util.StringUtils; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -124,6 +125,10 @@ public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); + for (DataH2s dataH2s : mapList) { + dataH2s.setStrength(!StringUtils.isEmpty(dataH2s.getStrength()) && + Float.valueOf(dataH2s.getStrength()) >= 100 ? "浓度溢出" : dataH2s.getStrength()); + } return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java new file mode 100644 index 0000000..d47a3dc --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BusMapOverviewGisMapper { + + List deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords); + + DeviceValueMapVO deviceValue(@Param("devcode") String devcode); +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml new file mode 100644 index 0000000..e4c3acf --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml @@ -0,0 +1,42 @@ + + + + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ - datediff(current_timestamp,install_date) + SYSDATE()-install_date @@ -303,7 +303,7 @@ - current_timestamp- Max(dt.logtime) + SYSDATE()- Max(dt.logtime) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java index 2273504..298f039 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java @@ -16,9 +16,10 @@ commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0])); commConfigDTO.setInterval(Long.valueOf(content.split(",")[1])); commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",",5)[3])){ - commConfigDTO.setIp(content.split(",", 5)[3]); - commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4])); + if(StringUtils.isNotBlank(content.split(",",6)[3])){ + commConfigDTO.setIp(content.split(",", 6)[3]); + commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[4])); + commConfigDTO.setThresh(Float.valueOf(content.split(",", 6)[5])); } redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 6391fd7..35b04da 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -112,7 +112,7 @@ BusConfig busConfig = new BusConfig(busConfigDTO); String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," - + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 + + busConfigDTO.getIp() + "," + busConfigDTO.getPort() + "," + busConfigDTO.getThreshold();//按照重传次数、采集间隔、上传周期 busConfig.setFramecontent(str); save(busConfig); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java index e842023..09b8107 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java @@ -39,6 +39,7 @@ @RequestMapping("/overview") public class BusMapOverviewController extends BaseController { + @Resource private AbstractPermissionContext permissionService; @Resource diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java new file mode 100644 index 0000000..31adf46 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import com.casic.missiles.modular.system.service.BusMapOverviewGisService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/overviewGis") +@RequiredArgsConstructor +public class BusMapOverviewGisController extends BaseController { + + private final BusMapOverviewGisService busMapOverviewGisService; + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceList") + public Object deviceList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deviceType) { + List mapList = busMapOverviewGisService.deviceList(deviceType, keywords); + return ResponseData.success(mapList); + } + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceValue") + public Object deviceValue(@RequestParam(required = true) String code) { + DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code); + return ResponseData.success(deviceValue); + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 0cc1d6d..398a253 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.alibaba.druid.util.StringUtils; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -124,6 +125,10 @@ public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); + for (DataH2s dataH2s : mapList) { + dataH2s.setStrength(!StringUtils.isEmpty(dataH2s.getStrength()) && + Float.valueOf(dataH2s.getStrength()) >= 100 ? "浓度溢出" : dataH2s.getStrength()); + } return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java new file mode 100644 index 0000000..d47a3dc --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BusMapOverviewGisMapper { + + List deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords); + + DeviceValueMapVO deviceValue(@Param("devcode") String devcode); +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml new file mode 100644 index 0000000..e4c3acf --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml @@ -0,0 +1,42 @@ + + + + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ - datediff(current_timestamp,install_date) + SYSDATE()-install_date @@ -303,7 +303,7 @@ - current_timestamp- Max(dt.logtime) + SYSDATE()- Max(dt.logtime) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java index 2273504..298f039 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java @@ -16,9 +16,10 @@ commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0])); commConfigDTO.setInterval(Long.valueOf(content.split(",")[1])); commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",",5)[3])){ - commConfigDTO.setIp(content.split(",", 5)[3]); - commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4])); + if(StringUtils.isNotBlank(content.split(",",6)[3])){ + commConfigDTO.setIp(content.split(",", 6)[3]); + commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[4])); + commConfigDTO.setThresh(Float.valueOf(content.split(",", 6)[5])); } redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 6391fd7..35b04da 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -112,7 +112,7 @@ BusConfig busConfig = new BusConfig(busConfigDTO); String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," - + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 + + busConfigDTO.getIp() + "," + busConfigDTO.getPort() + "," + busConfigDTO.getThreshold();//按照重传次数、采集间隔、上传周期 busConfig.setFramecontent(str); save(busConfig); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), diff --git a/casic-server/pom.xml b/casic-server/pom.xml index ff737d4..e973f0e 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -80,6 +80,26 @@ dynamic-datasource-spring-boot-starter 2.5.4 + + + com.casic + casic-admin-core + ${admin.version} + + + io.springfox + springfox-swagger2 + + + io.springfox + springfox-core + + + io.springfox + springfox-spring-web + + + diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java index e842023..09b8107 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java @@ -39,6 +39,7 @@ @RequestMapping("/overview") public class BusMapOverviewController extends BaseController { + @Resource private AbstractPermissionContext permissionService; @Resource diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java new file mode 100644 index 0000000..31adf46 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import com.casic.missiles.modular.system.service.BusMapOverviewGisService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/overviewGis") +@RequiredArgsConstructor +public class BusMapOverviewGisController extends BaseController { + + private final BusMapOverviewGisService busMapOverviewGisService; + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceList") + public Object deviceList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deviceType) { + List mapList = busMapOverviewGisService.deviceList(deviceType, keywords); + return ResponseData.success(mapList); + } + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceValue") + public Object deviceValue(@RequestParam(required = true) String code) { + DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code); + return ResponseData.success(deviceValue); + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 0cc1d6d..398a253 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.alibaba.druid.util.StringUtils; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -124,6 +125,10 @@ public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); + for (DataH2s dataH2s : mapList) { + dataH2s.setStrength(!StringUtils.isEmpty(dataH2s.getStrength()) && + Float.valueOf(dataH2s.getStrength()) >= 100 ? "浓度溢出" : dataH2s.getStrength()); + } return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java new file mode 100644 index 0000000..d47a3dc --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BusMapOverviewGisMapper { + + List deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords); + + DeviceValueMapVO deviceValue(@Param("devcode") String devcode); +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml new file mode 100644 index 0000000..e4c3acf --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml @@ -0,0 +1,42 @@ + + + + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ - datediff(current_timestamp,install_date) + SYSDATE()-install_date @@ -303,7 +303,7 @@ - current_timestamp- Max(dt.logtime) + SYSDATE()- Max(dt.logtime) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java index 2273504..298f039 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java @@ -16,9 +16,10 @@ commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0])); commConfigDTO.setInterval(Long.valueOf(content.split(",")[1])); commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",",5)[3])){ - commConfigDTO.setIp(content.split(",", 5)[3]); - commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4])); + if(StringUtils.isNotBlank(content.split(",",6)[3])){ + commConfigDTO.setIp(content.split(",", 6)[3]); + commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[4])); + commConfigDTO.setThresh(Float.valueOf(content.split(",", 6)[5])); } redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 6391fd7..35b04da 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -112,7 +112,7 @@ BusConfig busConfig = new BusConfig(busConfigDTO); String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," - + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 + + busConfigDTO.getIp() + "," + busConfigDTO.getPort() + "," + busConfigDTO.getThreshold();//按照重传次数、采集间隔、上传周期 busConfig.setFramecontent(str); save(busConfig); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), diff --git a/casic-server/pom.xml b/casic-server/pom.xml index ff737d4..e973f0e 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -80,6 +80,26 @@ dynamic-datasource-spring-boot-starter 2.5.4 + + + com.casic + casic-admin-core + ${admin.version} + + + io.springfox + springfox-swagger2 + + + io.springfox + springfox-core + + + io.springfox + springfox-spring-web + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java new file mode 100644 index 0000000..2f0eb3e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java @@ -0,0 +1,120 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.casic.missiles.core.application.enums.LoginEventTypeEnum; +import com.casic.missiles.core.application.event.UserLoginEvent; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.language.I18nFactory; +import com.casic.missiles.core.cache.CacheUtil; +import com.casic.missiles.core.common.exception.BizExceptionEnum; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.core.shiro.ShiroSessionCacheManager; +import com.casic.missiles.core.util.HttpContext; +import com.casic.missiles.model.application.event.core.EventPublisher; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.interfaces.log.LogManager; +import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory; +import com.casic.missiles.modular.system.dto.LockAccountDTO; +import com.casic.missiles.modular.system.dto.LoginSuccessDTO; +import com.casic.missiles.modular.system.dto.UserVO; +import com.casic.missiles.modular.system.service.ILoginCheckService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.session.Session; +import org.apache.shiro.subject.Subject; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedHashMap; + +/** + * @author cz + * @date 2023-09-14 + */ +@RestController +@RequiredArgsConstructor +@Slf4j +public class ThirdUserController extends BaseController { + + private final ILoginCheckService loginCheckService; + private final ShiroSessionCacheManager sessionCacheManager; + private final EventPublisher publisher; + + /** + * 第三方用户传入userCode，进行验证获取token信息 + */ + @RequestMapping("/user/login/token") + public Object userLoginToken(@RequestBody UserVO userVO) { + return loginIn(userVO.getUserCode()); + } + + + private Object loginIn(String userCode) { + String password = "111111"; + SuccessResponseData resultData = new SuccessResponseData(); + LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode); + super.getSession().setAttribute("isApp", false); + Subject currentUser = ShiroKit.getSubject(); + UsernamePasswordToken token = new UsernamePasswordToken(userCode, password.toCharArray()); + token.setRememberMe(false); + try { + currentUser.login(token); + CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount()); + } catch (Exception var17) { + resultData.setCode(BizExceptionEnum.USER_NOT_EXISTED.getCode()); + resultData.setMessage(I18nFactory.getMessage("admin.nouser.error")); + return this.loginCheckService.checkLoginException(var17, resultData, lockAccountDTO); + } + + AuthUser authUser = ShiroKit.getUser(); + super.getSession().setAttribute("shiroUser", authUser); + super.getSession().setAttribute("username", authUser.getAccount()); + super.getSession().setAttribute("userId", authUser.getId()); + + try { + LogManager.me().executeLog(LogTaskFactory.loginLog(authUser.getId(), HttpContext.getIp())); + } catch (Exception var16) { + log.error("login log fail:{}", var16); + } + + ShiroKit.getSession().setAttribute("sessionFlag", true); + Session session = ShiroKit.getSession(); + Subject newUser = ShiroKit.getSubject(); + LinkedHashMap attributes = new LinkedHashMap(); + Collection keys = session.getAttributeKeys(); + Iterator var13 = keys.iterator(); + + Object key; + while (var13.hasNext()) { + key = var13.next(); + Object value = session.getAttribute(key); + if (value != null) { + attributes.put(key, value); + } + } + + session.stop(); + session = newUser.getSession(true); + session.setAttribute("isApp", false); + newUser.login(token); + var13 = attributes.keySet().iterator(); + + while (var13.hasNext()) { + key = var13.next(); + session.setAttribute(key, attributes.get(key)); + } + + resultData.setData(new LoginSuccessDTO(session.getId().toString(), (String) null)); + resultData.setMessage(I18nFactory.getMessage("login.sucess")); + this.publisher.publishEvent(new UserLoginEvent(LoginEventTypeEnum.LOGIN_ON, ShiroKit.getUser())); + this.sessionCacheManager.sessionCache(session, authUser.getAccount()); + return resultData; + } + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java index e842023..09b8107 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java @@ -39,6 +39,7 @@ @RequestMapping("/overview") public class BusMapOverviewController extends BaseController { + @Resource private AbstractPermissionContext permissionService; @Resource diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java new file mode 100644 index 0000000..31adf46 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import com.casic.missiles.modular.system.service.BusMapOverviewGisService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/overviewGis") +@RequiredArgsConstructor +public class BusMapOverviewGisController extends BaseController { + + private final BusMapOverviewGisService busMapOverviewGisService; + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceList") + public Object deviceList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deviceType) { + List mapList = busMapOverviewGisService.deviceList(deviceType, keywords); + return ResponseData.success(mapList); + } + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceValue") + public Object deviceValue(@RequestParam(required = true) String code) { + DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code); + return ResponseData.success(deviceValue); + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 0cc1d6d..398a253 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.alibaba.druid.util.StringUtils; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -124,6 +125,10 @@ public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); + for (DataH2s dataH2s : mapList) { + dataH2s.setStrength(!StringUtils.isEmpty(dataH2s.getStrength()) && + Float.valueOf(dataH2s.getStrength()) >= 100 ? "浓度溢出" : dataH2s.getStrength()); + } return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java new file mode 100644 index 0000000..d47a3dc --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BusMapOverviewGisMapper { + + List deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords); + + DeviceValueMapVO deviceValue(@Param("devcode") String devcode); +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml new file mode 100644 index 0000000..e4c3acf --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml @@ -0,0 +1,42 @@ + + + + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ - datediff(current_timestamp,install_date) + SYSDATE()-install_date @@ -303,7 +303,7 @@ - current_timestamp- Max(dt.logtime) + SYSDATE()- Max(dt.logtime) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java index 2273504..298f039 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java @@ -16,9 +16,10 @@ commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0])); commConfigDTO.setInterval(Long.valueOf(content.split(",")[1])); commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",",5)[3])){ - commConfigDTO.setIp(content.split(",", 5)[3]); - commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4])); + if(StringUtils.isNotBlank(content.split(",",6)[3])){ + commConfigDTO.setIp(content.split(",", 6)[3]); + commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[4])); + commConfigDTO.setThresh(Float.valueOf(content.split(",", 6)[5])); } redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 6391fd7..35b04da 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -112,7 +112,7 @@ BusConfig busConfig = new BusConfig(busConfigDTO); String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," - + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 + + busConfigDTO.getIp() + "," + busConfigDTO.getPort() + "," + busConfigDTO.getThreshold();//按照重传次数、采集间隔、上传周期 busConfig.setFramecontent(str); save(busConfig); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), diff --git a/casic-server/pom.xml b/casic-server/pom.xml index ff737d4..e973f0e 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -80,6 +80,26 @@ dynamic-datasource-spring-boot-starter 2.5.4 + + + com.casic + casic-admin-core + ${admin.version} + + + io.springfox + springfox-swagger2 + + + io.springfox + springfox-core + + + io.springfox + springfox-spring-web + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java new file mode 100644 index 0000000..2f0eb3e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java @@ -0,0 +1,120 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.casic.missiles.core.application.enums.LoginEventTypeEnum; +import com.casic.missiles.core.application.event.UserLoginEvent; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.language.I18nFactory; +import com.casic.missiles.core.cache.CacheUtil; +import com.casic.missiles.core.common.exception.BizExceptionEnum; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.core.shiro.ShiroSessionCacheManager; +import com.casic.missiles.core.util.HttpContext; +import com.casic.missiles.model.application.event.core.EventPublisher; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.interfaces.log.LogManager; +import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory; +import com.casic.missiles.modular.system.dto.LockAccountDTO; +import com.casic.missiles.modular.system.dto.LoginSuccessDTO; +import com.casic.missiles.modular.system.dto.UserVO; +import com.casic.missiles.modular.system.service.ILoginCheckService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.session.Session; +import org.apache.shiro.subject.Subject; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedHashMap; + +/** + * @author cz + * @date 2023-09-14 + */ +@RestController +@RequiredArgsConstructor +@Slf4j +public class ThirdUserController extends BaseController { + + private final ILoginCheckService loginCheckService; + private final ShiroSessionCacheManager sessionCacheManager; + private final EventPublisher publisher; + + /** + * 第三方用户传入userCode，进行验证获取token信息 + */ + @RequestMapping("/user/login/token") + public Object userLoginToken(@RequestBody UserVO userVO) { + return loginIn(userVO.getUserCode()); + } + + + private Object loginIn(String userCode) { + String password = "111111"; + SuccessResponseData resultData = new SuccessResponseData(); + LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode); + super.getSession().setAttribute("isApp", false); + Subject currentUser = ShiroKit.getSubject(); + UsernamePasswordToken token = new UsernamePasswordToken(userCode, password.toCharArray()); + token.setRememberMe(false); + try { + currentUser.login(token); + CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount()); + } catch (Exception var17) { + resultData.setCode(BizExceptionEnum.USER_NOT_EXISTED.getCode()); + resultData.setMessage(I18nFactory.getMessage("admin.nouser.error")); + return this.loginCheckService.checkLoginException(var17, resultData, lockAccountDTO); + } + + AuthUser authUser = ShiroKit.getUser(); + super.getSession().setAttribute("shiroUser", authUser); + super.getSession().setAttribute("username", authUser.getAccount()); + super.getSession().setAttribute("userId", authUser.getId()); + + try { + LogManager.me().executeLog(LogTaskFactory.loginLog(authUser.getId(), HttpContext.getIp())); + } catch (Exception var16) { + log.error("login log fail:{}", var16); + } + + ShiroKit.getSession().setAttribute("sessionFlag", true); + Session session = ShiroKit.getSession(); + Subject newUser = ShiroKit.getSubject(); + LinkedHashMap attributes = new LinkedHashMap(); + Collection keys = session.getAttributeKeys(); + Iterator var13 = keys.iterator(); + + Object key; + while (var13.hasNext()) { + key = var13.next(); + Object value = session.getAttribute(key); + if (value != null) { + attributes.put(key, value); + } + } + + session.stop(); + session = newUser.getSession(true); + session.setAttribute("isApp", false); + newUser.login(token); + var13 = attributes.keySet().iterator(); + + while (var13.hasNext()) { + key = var13.next(); + session.setAttribute(key, attributes.get(key)); + } + + resultData.setData(new LoginSuccessDTO(session.getId().toString(), (String) null)); + resultData.setMessage(I18nFactory.getMessage("login.sucess")); + this.publisher.publishEvent(new UserLoginEvent(LoginEventTypeEnum.LOGIN_ON, ShiroKit.getUser())); + this.sessionCacheManager.sessionCache(session, authUser.getAccount()); + return resultData; + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/UserVO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/UserVO.java new file mode 100644 index 0000000..5be4352 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/UserVO.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @author cz + */ +@Data +public class UserVO { + + private String userCode; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java index e842023..09b8107 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java @@ -39,6 +39,7 @@ @RequestMapping("/overview") public class BusMapOverviewController extends BaseController { + @Resource private AbstractPermissionContext permissionService; @Resource diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java new file mode 100644 index 0000000..31adf46 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import com.casic.missiles.modular.system.service.BusMapOverviewGisService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/overviewGis") +@RequiredArgsConstructor +public class BusMapOverviewGisController extends BaseController { + + private final BusMapOverviewGisService busMapOverviewGisService; + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceList") + public Object deviceList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deviceType) { + List mapList = busMapOverviewGisService.deviceList(deviceType, keywords); + return ResponseData.success(mapList); + } + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceValue") + public Object deviceValue(@RequestParam(required = true) String code) { + DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code); + return ResponseData.success(deviceValue); + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 0cc1d6d..398a253 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.alibaba.druid.util.StringUtils; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -124,6 +125,10 @@ public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); + for (DataH2s dataH2s : mapList) { + dataH2s.setStrength(!StringUtils.isEmpty(dataH2s.getStrength()) && + Float.valueOf(dataH2s.getStrength()) >= 100 ? "浓度溢出" : dataH2s.getStrength()); + } return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java new file mode 100644 index 0000000..d47a3dc --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BusMapOverviewGisMapper { + + List deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords); + + DeviceValueMapVO deviceValue(@Param("devcode") String devcode); +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml new file mode 100644 index 0000000..e4c3acf --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml @@ -0,0 +1,42 @@ + + + + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ - datediff(current_timestamp,install_date) + SYSDATE()-install_date @@ -303,7 +303,7 @@ - current_timestamp- Max(dt.logtime) + SYSDATE()- Max(dt.logtime) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java index 2273504..298f039 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java @@ -16,9 +16,10 @@ commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0])); commConfigDTO.setInterval(Long.valueOf(content.split(",")[1])); commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",",5)[3])){ - commConfigDTO.setIp(content.split(",", 5)[3]); - commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4])); + if(StringUtils.isNotBlank(content.split(",",6)[3])){ + commConfigDTO.setIp(content.split(",", 6)[3]); + commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[4])); + commConfigDTO.setThresh(Float.valueOf(content.split(",", 6)[5])); } redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 6391fd7..35b04da 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -112,7 +112,7 @@ BusConfig busConfig = new BusConfig(busConfigDTO); String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," - + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 + + busConfigDTO.getIp() + "," + busConfigDTO.getPort() + "," + busConfigDTO.getThreshold();//按照重传次数、采集间隔、上传周期 busConfig.setFramecontent(str); save(busConfig); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), diff --git a/casic-server/pom.xml b/casic-server/pom.xml index ff737d4..e973f0e 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -80,6 +80,26 @@ dynamic-datasource-spring-boot-starter 2.5.4 + + + com.casic + casic-admin-core + ${admin.version} + + + io.springfox + springfox-swagger2 + + + io.springfox + springfox-core + + + io.springfox + springfox-spring-web + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java new file mode 100644 index 0000000..2f0eb3e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java @@ -0,0 +1,120 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.casic.missiles.core.application.enums.LoginEventTypeEnum; +import com.casic.missiles.core.application.event.UserLoginEvent; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.language.I18nFactory; +import com.casic.missiles.core.cache.CacheUtil; +import com.casic.missiles.core.common.exception.BizExceptionEnum; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.core.shiro.ShiroSessionCacheManager; +import com.casic.missiles.core.util.HttpContext; +import com.casic.missiles.model.application.event.core.EventPublisher; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.interfaces.log.LogManager; +import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory; +import com.casic.missiles.modular.system.dto.LockAccountDTO; +import com.casic.missiles.modular.system.dto.LoginSuccessDTO; +import com.casic.missiles.modular.system.dto.UserVO; +import com.casic.missiles.modular.system.service.ILoginCheckService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.session.Session; +import org.apache.shiro.subject.Subject; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedHashMap; + +/** + * @author cz + * @date 2023-09-14 + */ +@RestController +@RequiredArgsConstructor +@Slf4j +public class ThirdUserController extends BaseController { + + private final ILoginCheckService loginCheckService; + private final ShiroSessionCacheManager sessionCacheManager; + private final EventPublisher publisher; + + /** + * 第三方用户传入userCode，进行验证获取token信息 + */ + @RequestMapping("/user/login/token") + public Object userLoginToken(@RequestBody UserVO userVO) { + return loginIn(userVO.getUserCode()); + } + + + private Object loginIn(String userCode) { + String password = "111111"; + SuccessResponseData resultData = new SuccessResponseData(); + LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode); + super.getSession().setAttribute("isApp", false); + Subject currentUser = ShiroKit.getSubject(); + UsernamePasswordToken token = new UsernamePasswordToken(userCode, password.toCharArray()); + token.setRememberMe(false); + try { + currentUser.login(token); + CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount()); + } catch (Exception var17) { + resultData.setCode(BizExceptionEnum.USER_NOT_EXISTED.getCode()); + resultData.setMessage(I18nFactory.getMessage("admin.nouser.error")); + return this.loginCheckService.checkLoginException(var17, resultData, lockAccountDTO); + } + + AuthUser authUser = ShiroKit.getUser(); + super.getSession().setAttribute("shiroUser", authUser); + super.getSession().setAttribute("username", authUser.getAccount()); + super.getSession().setAttribute("userId", authUser.getId()); + + try { + LogManager.me().executeLog(LogTaskFactory.loginLog(authUser.getId(), HttpContext.getIp())); + } catch (Exception var16) { + log.error("login log fail:{}", var16); + } + + ShiroKit.getSession().setAttribute("sessionFlag", true); + Session session = ShiroKit.getSession(); + Subject newUser = ShiroKit.getSubject(); + LinkedHashMap attributes = new LinkedHashMap(); + Collection keys = session.getAttributeKeys(); + Iterator var13 = keys.iterator(); + + Object key; + while (var13.hasNext()) { + key = var13.next(); + Object value = session.getAttribute(key); + if (value != null) { + attributes.put(key, value); + } + } + + session.stop(); + session = newUser.getSession(true); + session.setAttribute("isApp", false); + newUser.login(token); + var13 = attributes.keySet().iterator(); + + while (var13.hasNext()) { + key = var13.next(); + session.setAttribute(key, attributes.get(key)); + } + + resultData.setData(new LoginSuccessDTO(session.getId().toString(), (String) null)); + resultData.setMessage(I18nFactory.getMessage("login.sucess")); + this.publisher.publishEvent(new UserLoginEvent(LoginEventTypeEnum.LOGIN_ON, ShiroKit.getUser())); + this.sessionCacheManager.sessionCache(session, authUser.getAccount()); + return resultData; + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/UserVO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/UserVO.java new file mode 100644 index 0000000..5be4352 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/UserVO.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @author cz + */ +@Data +public class UserVO { + + private String userCode; +} 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 a512344..7d1d92c 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 @@ -70,6 +70,7 @@ FROM bus_device_well d JOIN bus_device bd ON bd.id=d.device_id WHERE bd.VALID = '1' + AND d.VALID='1' GROUP BY well_id ) c ON w.id = c.well_id diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java index e842023..09b8107 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java @@ -39,6 +39,7 @@ @RequestMapping("/overview") public class BusMapOverviewController extends BaseController { + @Resource private AbstractPermissionContext permissionService; @Resource diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java new file mode 100644 index 0000000..31adf46 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import com.casic.missiles.modular.system.service.BusMapOverviewGisService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/overviewGis") +@RequiredArgsConstructor +public class BusMapOverviewGisController extends BaseController { + + private final BusMapOverviewGisService busMapOverviewGisService; + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceList") + public Object deviceList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deviceType) { + List mapList = busMapOverviewGisService.deviceList(deviceType, keywords); + return ResponseData.success(mapList); + } + + /* + * 获取列表 + */ + @RequestMapping(value = "/deviceValue") + public Object deviceValue(@RequestParam(required = true) String code) { + DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code); + return ResponseData.success(deviceValue); + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 0cc1d6d..398a253 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.alibaba.druid.util.StringUtils; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -124,6 +125,10 @@ public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); + for (DataH2s dataH2s : mapList) { + dataH2s.setStrength(!StringUtils.isEmpty(dataH2s.getStrength()) && + Float.valueOf(dataH2s.getStrength()) >= 100 ? "浓度溢出" : dataH2s.getStrength()); + } return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java new file mode 100644 index 0000000..d47a3dc --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.DeviceMapVO; +import com.casic.missiles.modular.system.model.DeviceValueMapVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BusMapOverviewGisMapper { + + List deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords); + + DeviceValueMapVO deviceValue(@Param("devcode") String devcode); +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml new file mode 100644 index 0000000..e4c3acf --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml @@ -0,0 +1,42 @@ + + + + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + + + + \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index 91919f7..30a2d47 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -87,7 +87,7 @@ - TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi:ss') @@ -614,7 +614,7 @@ - datediff(current_timestamp,install_date) + SYSDATE()-install_date @@ -303,7 +303,7 @@ - current_timestamp- Max(dt.logtime) + SYSDATE()- Max(dt.logtime) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java index 2273504..298f039 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java @@ -16,9 +16,10 @@ commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0])); commConfigDTO.setInterval(Long.valueOf(content.split(",")[1])); commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",",5)[3])){ - commConfigDTO.setIp(content.split(",", 5)[3]); - commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4])); + if(StringUtils.isNotBlank(content.split(",",6)[3])){ + commConfigDTO.setIp(content.split(",", 6)[3]); + commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[4])); + commConfigDTO.setThresh(Float.valueOf(content.split(",", 6)[5])); } redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 6391fd7..35b04da 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -112,7 +112,7 @@ BusConfig busConfig = new BusConfig(busConfigDTO); String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," - + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 + + busConfigDTO.getIp() + "," + busConfigDTO.getPort() + "," + busConfigDTO.getThreshold();//按照重传次数、采集间隔、上传周期 busConfig.setFramecontent(str); save(busConfig); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), diff --git a/casic-server/pom.xml b/casic-server/pom.xml index ff737d4..e973f0e 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -80,6 +80,26 @@ dynamic-datasource-spring-boot-starter 2.5.4 + + + com.casic + casic-admin-core + ${admin.version} + + + io.springfox + springfox-swagger2 + + + io.springfox + springfox-core + + + io.springfox + springfox-spring-web + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java new file mode 100644 index 0000000..2f0eb3e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java @@ -0,0 +1,120 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.casic.missiles.core.application.enums.LoginEventTypeEnum; +import com.casic.missiles.core.application.event.UserLoginEvent; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.language.I18nFactory; +import com.casic.missiles.core.cache.CacheUtil; +import com.casic.missiles.core.common.exception.BizExceptionEnum; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.core.shiro.ShiroSessionCacheManager; +import com.casic.missiles.core.util.HttpContext; +import com.casic.missiles.model.application.event.core.EventPublisher; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.interfaces.log.LogManager; +import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory; +import com.casic.missiles.modular.system.dto.LockAccountDTO; +import com.casic.missiles.modular.system.dto.LoginSuccessDTO; +import com.casic.missiles.modular.system.dto.UserVO; +import com.casic.missiles.modular.system.service.ILoginCheckService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.session.Session; +import org.apache.shiro.subject.Subject; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedHashMap; + +/** + * @author cz + * @date 2023-09-14 + */ +@RestController +@RequiredArgsConstructor +@Slf4j +public class ThirdUserController extends BaseController { + + private final ILoginCheckService loginCheckService; + private final ShiroSessionCacheManager sessionCacheManager; + private final EventPublisher publisher; + + /** + * 第三方用户传入userCode，进行验证获取token信息 + */ + @RequestMapping("/user/login/token") + public Object userLoginToken(@RequestBody UserVO userVO) { + return loginIn(userVO.getUserCode()); + } + + + private Object loginIn(String userCode) { + String password = "111111"; + SuccessResponseData resultData = new SuccessResponseData(); + LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode); + super.getSession().setAttribute("isApp", false); + Subject currentUser = ShiroKit.getSubject(); + UsernamePasswordToken token = new UsernamePasswordToken(userCode, password.toCharArray()); + token.setRememberMe(false); + try { + currentUser.login(token); + CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount()); + } catch (Exception var17) { + resultData.setCode(BizExceptionEnum.USER_NOT_EXISTED.getCode()); + resultData.setMessage(I18nFactory.getMessage("admin.nouser.error")); + return this.loginCheckService.checkLoginException(var17, resultData, lockAccountDTO); + } + + AuthUser authUser = ShiroKit.getUser(); + super.getSession().setAttribute("shiroUser", authUser); + super.getSession().setAttribute("username", authUser.getAccount()); + super.getSession().setAttribute("userId", authUser.getId()); + + try { + LogManager.me().executeLog(LogTaskFactory.loginLog(authUser.getId(), HttpContext.getIp())); + } catch (Exception var16) { + log.error("login log fail:{}", var16); + } + + ShiroKit.getSession().setAttribute("sessionFlag", true); + Session session = ShiroKit.getSession(); + Subject newUser = ShiroKit.getSubject(); + LinkedHashMap attributes = new LinkedHashMap(); + Collection keys = session.getAttributeKeys(); + Iterator var13 = keys.iterator(); + + Object key; + while (var13.hasNext()) { + key = var13.next(); + Object value = session.getAttribute(key); + if (value != null) { + attributes.put(key, value); + } + } + + session.stop(); + session = newUser.getSession(true); + session.setAttribute("isApp", false); + newUser.login(token); + var13 = attributes.keySet().iterator(); + + while (var13.hasNext()) { + key = var13.next(); + session.setAttribute(key, attributes.get(key)); + } + + resultData.setData(new LoginSuccessDTO(session.getId().toString(), (String) null)); + resultData.setMessage(I18nFactory.getMessage("login.sucess")); + this.publisher.publishEvent(new UserLoginEvent(LoginEventTypeEnum.LOGIN_ON, ShiroKit.getUser())); + this.sessionCacheManager.sessionCache(session, authUser.getAccount()); + return resultData; + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/UserVO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/UserVO.java new file mode 100644 index 0000000..5be4352 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/UserVO.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @author cz + */ +@Data +public class UserVO { + + private String userCode; +} 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 a512344..7d1d92c 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 @@ -70,6 +70,7 @@ FROM bus_device_well d JOIN bus_device bd ON bd.id=d.device_id WHERE bd.VALID = '1' + AND d.VALID='1' GROUP BY well_id ) c ON w.id = c.well_id diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 8e600be..bb25e4d 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -173,6 +173,12 @@ 2.5.4 + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + +