diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 041cb2a..b071dc8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -32,4 +32,8 @@ DeviceInfoDto selectDeviceById(@Param("id") Long id); List getDeviceInWellInfo(@Param("id") Long id); + + DeviceDto getDetailById(@Param("id")String id); + + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 041cb2a..b071dc8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -32,4 +32,8 @@ DeviceInfoDto selectDeviceById(@Param("id") Long id); List getDeviceInWellInfo(@Param("id") Long id); + + DeviceDto getDetailById(@Param("id")String id); + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index d716794..0f589db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Param; import java.io.Serializable; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,4 +22,6 @@ int countDeviceByModels(@Param("modelId") Serializable modelId); List selectModelList(@Param("deviceType") Long deviceType); + + Map getDictNameByCode(); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 041cb2a..b071dc8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -32,4 +32,8 @@ DeviceInfoDto selectDeviceById(@Param("id") Long id); List getDeviceInWellInfo(@Param("id") Long id); + + DeviceDto getDetailById(@Param("id")String id); + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index d716794..0f589db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Param; import java.io.Serializable; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,4 +22,6 @@ int countDeviceByModels(@Param("modelId") Serializable modelId); List selectModelList(@Param("deviceType") Long deviceType); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java index 500b7a4..a11ec0b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java @@ -20,4 +20,5 @@ * 根据设备类型统计设备（检查设备类型是否存在绑定设备） */ int countDeviceByType(@Param("typeId") Serializable typeId); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 041cb2a..b071dc8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -32,4 +32,8 @@ DeviceInfoDto selectDeviceById(@Param("id") Long id); List getDeviceInWellInfo(@Param("id") Long id); + + DeviceDto getDetailById(@Param("id")String id); + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index d716794..0f589db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Param; import java.io.Serializable; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,4 +22,6 @@ int countDeviceByModels(@Param("modelId") Serializable modelId); List selectModelList(@Param("deviceType") Long deviceType); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java index 500b7a4..a11ec0b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java @@ -20,4 +20,5 @@ * 根据设备类型统计设备（检查设备类型是否存在绑定设备） */ int countDeviceByType(@Param("typeId") Serializable typeId); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ca4e201..4622bdf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -211,4 +211,12 @@ AND dw.VALID=1 ) + + + + diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 041cb2a..b071dc8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -32,4 +32,8 @@ DeviceInfoDto selectDeviceById(@Param("id") Long id); List getDeviceInWellInfo(@Param("id") Long id); + + DeviceDto getDetailById(@Param("id")String id); + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index d716794..0f589db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Param; import java.io.Serializable; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,4 +22,6 @@ int countDeviceByModels(@Param("modelId") Serializable modelId); List selectModelList(@Param("deviceType") Long deviceType); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java index 500b7a4..a11ec0b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java @@ -20,4 +20,5 @@ * 根据设备类型统计设备（检查设备类型是否存在绑定设备） */ int countDeviceByType(@Param("typeId") Serializable typeId); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ca4e201..4622bdf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -211,4 +211,12 @@ AND dw.VALID=1 ) + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index da5d652..9f1b06f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -4,10 +4,10 @@ - - - - + + + + @@ -38,4 +38,15 @@ + + + diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 041cb2a..b071dc8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -32,4 +32,8 @@ DeviceInfoDto selectDeviceById(@Param("id") Long id); List getDeviceInWellInfo(@Param("id") Long id); + + DeviceDto getDetailById(@Param("id")String id); + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index d716794..0f589db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Param; import java.io.Serializable; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,4 +22,6 @@ int countDeviceByModels(@Param("modelId") Serializable modelId); List selectModelList(@Param("deviceType") Long deviceType); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java index 500b7a4..a11ec0b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java @@ -20,4 +20,5 @@ * 根据设备类型统计设备（检查设备类型是否存在绑定设备） */ int countDeviceByType(@Param("typeId") Serializable typeId); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ca4e201..4622bdf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -211,4 +211,12 @@ AND dw.VALID=1 ) + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index da5d652..9f1b06f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -4,10 +4,10 @@ - - - - + + + + @@ -38,4 +38,15 @@ + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 385d4f8..4bc79ba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -5,6 +5,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; /** *

@@ -30,4 +31,8 @@ List selectList(Long deviceType); + + DeviceModels selectDeviceTypeById(String id); + + Map getDictNameByCode(); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 041cb2a..b071dc8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -32,4 +32,8 @@ DeviceInfoDto selectDeviceById(@Param("id") Long id); List getDeviceInWellInfo(@Param("id") Long id); + + DeviceDto getDetailById(@Param("id")String id); + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index d716794..0f589db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Param; import java.io.Serializable; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,4 +22,6 @@ int countDeviceByModels(@Param("modelId") Serializable modelId); List selectModelList(@Param("deviceType") Long deviceType); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java index 500b7a4..a11ec0b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java @@ -20,4 +20,5 @@ * 根据设备类型统计设备（检查设备类型是否存在绑定设备） */ int countDeviceByType(@Param("typeId") Serializable typeId); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ca4e201..4622bdf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -211,4 +211,12 @@ AND dw.VALID=1 ) + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index da5d652..9f1b06f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -4,10 +4,10 @@ - - - - + + + + @@ -38,4 +38,15 @@ + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 385d4f8..4bc79ba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -5,6 +5,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; /** *

@@ -30,4 +31,8 @@ List selectList(Long deviceType); + + DeviceModels selectDeviceTypeById(String id); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 81e52b1..bbaf5db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.Device; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -61,4 +62,5 @@ List selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus); void registerGeTui(Long id, String clientid); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 041cb2a..b071dc8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -32,4 +32,8 @@ DeviceInfoDto selectDeviceById(@Param("id") Long id); List getDeviceInWellInfo(@Param("id") Long id); + + DeviceDto getDetailById(@Param("id")String id); + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index d716794..0f589db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Param; import java.io.Serializable; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,4 +22,6 @@ int countDeviceByModels(@Param("modelId") Serializable modelId); List selectModelList(@Param("deviceType") Long deviceType); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java index 500b7a4..a11ec0b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java @@ -20,4 +20,5 @@ * 根据设备类型统计设备（检查设备类型是否存在绑定设备） */ int countDeviceByType(@Param("typeId") Serializable typeId); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ca4e201..4622bdf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -211,4 +211,12 @@ AND dw.VALID=1 ) + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index da5d652..9f1b06f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -4,10 +4,10 @@ - - - - + + + + @@ -38,4 +38,15 @@ + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 385d4f8..4bc79ba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -5,6 +5,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; /** *

@@ -30,4 +31,8 @@ List selectList(Long deviceType); + + DeviceModels selectDeviceTypeById(String id); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 81e52b1..bbaf5db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.Device; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -61,4 +62,5 @@ List selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus); void registerGeTui(Long id, String clientid); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 9b2d3d2..3684994 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -23,4 +23,7 @@ DeviceType selectDeviceTypeByName(String typeName); int countDeviceByType(Serializable typeId); + + DeviceType selectDeviceTypeById(String id); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 041cb2a..b071dc8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -32,4 +32,8 @@ DeviceInfoDto selectDeviceById(@Param("id") Long id); List getDeviceInWellInfo(@Param("id") Long id); + + DeviceDto getDetailById(@Param("id")String id); + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index d716794..0f589db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Param; import java.io.Serializable; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,4 +22,6 @@ int countDeviceByModels(@Param("modelId") Serializable modelId); List selectModelList(@Param("deviceType") Long deviceType); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java index 500b7a4..a11ec0b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java @@ -20,4 +20,5 @@ * 根据设备类型统计设备（检查设备类型是否存在绑定设备） */ int countDeviceByType(@Param("typeId") Serializable typeId); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ca4e201..4622bdf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -211,4 +211,12 @@ AND dw.VALID=1 ) + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index da5d652..9f1b06f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -4,10 +4,10 @@ - - - - + + + + @@ -38,4 +38,15 @@ + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 385d4f8..4bc79ba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -5,6 +5,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; /** *

@@ -30,4 +31,8 @@ List selectList(Long deviceType); + + DeviceModels selectDeviceTypeById(String id); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 81e52b1..bbaf5db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.Device; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -61,4 +62,5 @@ List selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus); void registerGeTui(Long id, String clientid); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 9b2d3d2..3684994 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -23,4 +23,7 @@ DeviceType selectDeviceTypeByName(String typeName); int countDeviceByType(Serializable typeId); + + DeviceType selectDeviceTypeById(String id); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java index 41129a8..34d9e6b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java @@ -9,6 +9,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; /** *

@@ -38,4 +39,13 @@ return this.baseMapper.selectModelList(deviceType); } + @Override + public DeviceModels selectDeviceTypeById(String id) { + return this.baseMapper.selectById(id); + } + + @Override + public Map getDictNameByCode() { + return this.baseMapper.getDictNameByCode(); + } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 041cb2a..b071dc8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -32,4 +32,8 @@ DeviceInfoDto selectDeviceById(@Param("id") Long id); List getDeviceInWellInfo(@Param("id") Long id); + + DeviceDto getDetailById(@Param("id")String id); + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index d716794..0f589db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Param; import java.io.Serializable; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,4 +22,6 @@ int countDeviceByModels(@Param("modelId") Serializable modelId); List selectModelList(@Param("deviceType") Long deviceType); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java index 500b7a4..a11ec0b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java @@ -20,4 +20,5 @@ * 根据设备类型统计设备（检查设备类型是否存在绑定设备） */ int countDeviceByType(@Param("typeId") Serializable typeId); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ca4e201..4622bdf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -211,4 +211,12 @@ AND dw.VALID=1 ) + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index da5d652..9f1b06f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -4,10 +4,10 @@ - - - - + + + + @@ -38,4 +38,15 @@ + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 385d4f8..4bc79ba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -5,6 +5,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; /** *

@@ -30,4 +31,8 @@ List selectList(Long deviceType); + + DeviceModels selectDeviceTypeById(String id); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 81e52b1..bbaf5db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.Device; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -61,4 +62,5 @@ List selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus); void registerGeTui(Long id, String clientid); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 9b2d3d2..3684994 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -23,4 +23,7 @@ DeviceType selectDeviceTypeByName(String typeName); int countDeviceByType(Serializable typeId); + + DeviceType selectDeviceTypeById(String id); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java index 41129a8..34d9e6b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java @@ -9,6 +9,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; /** *

@@ -38,4 +39,13 @@ return this.baseMapper.selectModelList(deviceType); } + @Override + public DeviceModels selectDeviceTypeById(String id) { + return this.baseMapper.selectById(id); + } + + @Override + public Map getDictNameByCode() { + return this.baseMapper.getDictNameByCode(); + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index 79d7b0d..c1ee623 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -23,7 +23,7 @@ @Override public DeviceType selectDeviceTypeByName(String typeName) { QueryWrapper query = new QueryWrapper(); - query.eq("TYPE_NAME",typeName); + query.eq("TYPE_NAME", typeName); return this.baseMapper.selectOne(query); } @@ -32,4 +32,9 @@ return this.baseMapper.countDeviceByType(typeId); } + @Override + public DeviceType selectDeviceTypeById(String id) { + return this.baseMapper.selectById(id); + } + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 041cb2a..b071dc8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -32,4 +32,8 @@ DeviceInfoDto selectDeviceById(@Param("id") Long id); List getDeviceInWellInfo(@Param("id") Long id); + + DeviceDto getDetailById(@Param("id")String id); + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index d716794..0f589db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Param; import java.io.Serializable; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,4 +22,6 @@ int countDeviceByModels(@Param("modelId") Serializable modelId); List selectModelList(@Param("deviceType") Long deviceType); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java index 500b7a4..a11ec0b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java @@ -20,4 +20,5 @@ * 根据设备类型统计设备（检查设备类型是否存在绑定设备） */ int countDeviceByType(@Param("typeId") Serializable typeId); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ca4e201..4622bdf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -211,4 +211,12 @@ AND dw.VALID=1 ) + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index da5d652..9f1b06f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -4,10 +4,10 @@ - - - - + + + + @@ -38,4 +38,15 @@ + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 385d4f8..4bc79ba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -5,6 +5,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; /** *

@@ -30,4 +31,8 @@ List selectList(Long deviceType); + + DeviceModels selectDeviceTypeById(String id); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 81e52b1..bbaf5db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.Device; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -61,4 +62,5 @@ List selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus); void registerGeTui(Long id, String clientid); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 9b2d3d2..3684994 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -23,4 +23,7 @@ DeviceType selectDeviceTypeByName(String typeName); int countDeviceByType(Serializable typeId); + + DeviceType selectDeviceTypeById(String id); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java index 41129a8..34d9e6b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java @@ -9,6 +9,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; /** *

@@ -38,4 +39,13 @@ return this.baseMapper.selectModelList(deviceType); } + @Override + public DeviceModels selectDeviceTypeById(String id) { + return this.baseMapper.selectById(id); + } + + @Override + public Map getDictNameByCode() { + return this.baseMapper.getDictNameByCode(); + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index 79d7b0d..c1ee623 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -23,7 +23,7 @@ @Override public DeviceType selectDeviceTypeByName(String typeName) { QueryWrapper query = new QueryWrapper(); - query.eq("TYPE_NAME",typeName); + query.eq("TYPE_NAME", typeName); return this.baseMapper.selectOne(query); } @@ -32,4 +32,9 @@ return this.baseMapper.countDeviceByType(typeId); } + @Override + public DeviceType selectDeviceTypeById(String id) { + return this.baseMapper.selectById(id); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java index 9e75c88..2f87ba3 100644 --- a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java +++ b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java @@ -15,8 +15,8 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -//import org.apache.http.entity.mime.MultipartEntityBuilder; -//import org.apache.http.entity.mime.content.FileBody; +import org.apache.http.entity.mime.MultipartEntityBuilder; +import org.apache.http.entity.mime.content.FileBody; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; @@ -162,11 +162,11 @@ HttpPost request = new HttpPost(url); addRequestHeader(request, headerMap); -// FileBody fileBody = new FileBody(file); -// // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b -// HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); -// request.setEntity(reqEntity); -// + FileBody fileBody = new FileBody(file); + // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b + HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); + request.setEntity(reqEntity); + return (StreamClosedHttpResponse) executeHttpRequest(request); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 041cb2a..b071dc8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -32,4 +32,8 @@ DeviceInfoDto selectDeviceById(@Param("id") Long id); List getDeviceInWellInfo(@Param("id") Long id); + + DeviceDto getDetailById(@Param("id")String id); + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index d716794..0f589db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Param; import java.io.Serializable; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,4 +22,6 @@ int countDeviceByModels(@Param("modelId") Serializable modelId); List selectModelList(@Param("deviceType") Long deviceType); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java index 500b7a4..a11ec0b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java @@ -20,4 +20,5 @@ * 根据设备类型统计设备（检查设备类型是否存在绑定设备） */ int countDeviceByType(@Param("typeId") Serializable typeId); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ca4e201..4622bdf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -211,4 +211,12 @@ AND dw.VALID=1 ) + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index da5d652..9f1b06f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -4,10 +4,10 @@ - - - - + + + + @@ -38,4 +38,15 @@ + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 385d4f8..4bc79ba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -5,6 +5,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; /** *

@@ -30,4 +31,8 @@ List selectList(Long deviceType); + + DeviceModels selectDeviceTypeById(String id); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 81e52b1..bbaf5db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.Device; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -61,4 +62,5 @@ List selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus); void registerGeTui(Long id, String clientid); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 9b2d3d2..3684994 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -23,4 +23,7 @@ DeviceType selectDeviceTypeByName(String typeName); int countDeviceByType(Serializable typeId); + + DeviceType selectDeviceTypeById(String id); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java index 41129a8..34d9e6b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java @@ -9,6 +9,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; /** *

@@ -38,4 +39,13 @@ return this.baseMapper.selectModelList(deviceType); } + @Override + public DeviceModels selectDeviceTypeById(String id) { + return this.baseMapper.selectById(id); + } + + @Override + public Map getDictNameByCode() { + return this.baseMapper.getDictNameByCode(); + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index 79d7b0d..c1ee623 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -23,7 +23,7 @@ @Override public DeviceType selectDeviceTypeByName(String typeName) { QueryWrapper query = new QueryWrapper(); - query.eq("TYPE_NAME",typeName); + query.eq("TYPE_NAME", typeName); return this.baseMapper.selectOne(query); } @@ -32,4 +32,9 @@ return this.baseMapper.countDeviceByType(typeId); } + @Override + public DeviceType selectDeviceTypeById(String id) { + return this.baseMapper.selectById(id); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java index 9e75c88..2f87ba3 100644 --- a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java +++ b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java @@ -15,8 +15,8 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -//import org.apache.http.entity.mime.MultipartEntityBuilder; -//import org.apache.http.entity.mime.content.FileBody; +import org.apache.http.entity.mime.MultipartEntityBuilder; +import org.apache.http.entity.mime.content.FileBody; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; @@ -162,11 +162,11 @@ HttpPost request = new HttpPost(url); addRequestHeader(request, headerMap); -// FileBody fileBody = new FileBody(file); -// // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b -// HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); -// request.setEntity(reqEntity); -// + FileBody fileBody = new FileBody(file); + // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b + HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); + request.setEntity(reqEntity); + return (StreamClosedHttpResponse) executeHttpRequest(request); } diff --git a/casic-quartz/pom.xml b/casic-quartz/pom.xml index 2da9661..56e3929 100644 --- a/casic-quartz/pom.xml +++ b/casic-quartz/pom.xml @@ -16,14 +16,14 @@ + org.springframework.boot + spring-boot-starter-aop + + + org.quartz-scheduler quartz 2.3.0 - - com.casic - casic-core - ${core.version} - \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 0886219..a8c2fc1 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index 74f2550..a769652 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -115,6 +115,7 @@ return resultData; } + @GetMapping(value = "/getAreaByDept") @ResponseBody public Object getAreaByDept(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 438f41d..e77540f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -22,9 +21,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dict.DeviceDict; -import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto; -import com.casic.missiles.modular.system.dto.DeviceDto; -import com.casic.missiles.modular.system.dto.DeviceSelectDto; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.DeviceAddParam; @@ -47,8 +44,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -123,6 +119,29 @@ return ResponseData.success(selectDtos); } +// /** +// * 获取设备详情 +// */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// @ResponseBody +// public Object deviceDetail(@RequestParam(required = true) String id) { +// if (null == id) { +// throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); +// } +// SuccessResponseData successResult = new SuccessResponseData(); +// try { +// DeviceInfoDto deviceInfoDto = deviceService.getDetailById(id); +// successResult.setMessage("success"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// successResult.setData(deviceInfoDto); +// } catch (AccessException ex) { +// log.error("主题:获取设备详情异常,异常信息为{}", ex); +// successResult.setMessage("获取设备详情数据库异常"); +// successResult.setCode(ResponseData.DEFAULT_ERROR_CODE); +// } +// return successResult; +// } + @GetMapping(value = "/model") @ResponseBody public Object model(String deviceType) { @@ -131,7 +150,6 @@ if (StrUtil.isNotEmpty(deviceType)) { query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType); } - List list = deviceModelsService.list(query); List selectDtos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { @@ -202,13 +220,13 @@ @Permission @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device , BindingResult result) { + public Object add(@Valid Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } // Device device = CreateDevice(deviceAddParam); try { - deviceService.save(device); + deviceService.save(device); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); String errorMsg = "设备添加失败"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 3d8f7bc..f180dba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.List; +import java.util.Map; + import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -21,6 +27,7 @@ * @author dev * @Date 2019-05-23 18:09:24 */ +@Slf4j @Controller @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { @@ -39,25 +46,58 @@ return deviceModelsService.selectList(deviceType); } + @Autowired + private IDeviceTypeService deviceTypeService; + /** * 获取分页列表 */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage();; - QueryWrapper query = new QueryWrapper<>(); - page = deviceModelsService.page(page,query); - return super.packForBT(page); + public Object listPage(String modelName) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = new QueryWrapper() + .like("MODEL_NAME", modelName == null ? "" : modelName); + page = deviceModelsService.page(page, query); + Map dictMap = deviceModelsService.getDictNameByCode(); + page.getRecords().stream().forEach( + DeviceModels -> { + DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName()); + String[] d = DeviceModels.getCommunication().split(","); + if (d.length > 0) { + DeviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + return new SuccessResponseData(super.packForBT(page)); } + /** * 新增 */ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceModels deviceModels) { - deviceModelsService.save(deviceModels); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceModels resultObjct = deviceModelsService.selectDeviceTypeById(deviceModels.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号编号重复"); + } else { + deviceModelsService.save(deviceModels); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：设备型号新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备型号新增数据库异常"); + } + return responseData; } /** @@ -67,7 +107,7 @@ @ResponseBody public Object delete(@RequestParam String deviceModelsId) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该型号存在绑定的设备，请先解除绑定"); } deviceModelsService.removeById(Long.valueOf(deviceModelsId)); @@ -82,7 +122,7 @@ public Object delete(@RequestParam("deviceModelsIds") List deviceModelsIds) { for (String deviceModelsId : deviceModelsIds) { int count = deviceModelsService.countDeviceByModels(deviceModelsId); - if(count > 0) { + if (count > 0) { String name = deviceModelsService.getById(deviceModelsId).getModelName(); return ResponseData.error(String.format("型号 %s 存在绑定的设备，请先解除绑定", name)); } @@ -98,7 +138,7 @@ @ResponseBody public Object update(DeviceModels deviceModels) { deviceModelsService.updateById(deviceModels); - return ResponseData.success(); + return ResponseData.success(); } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 1bd1276..d7d2c4f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -1,28 +1,31 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.modular.system.service.IDeviceTypeService; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeviceType; +import com.casic.missiles.modular.system.service.IDeviceTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.AccessException; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; -import com.casic.missiles.core.page.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.system.model.DeviceType; - /** - * 设备类型控制器(暂不使用 保留) + * 设备类型控制器 * * @author dev * @Date 2019-05-23 18:09:17 */ +@Slf4j @Controller @RequestMapping("/deviceType") public class DeviceTypeController extends BaseController { @@ -46,11 +49,18 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String deviceType, String isValid) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); + if (deviceType == null) { + deviceType = ""; + } + if (isValid == null) { + isValid = ""; + } + QueryWrapper query = new QueryWrapper() + .like("TYPE_NAME", deviceType).like("VALID", isValid); page = deviceTypeService.page(page, query); - return super.packForBT(page); + return new SuccessResponseData(super.packForBT(page)); } /** @@ -59,8 +69,23 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(DeviceType deviceType) { - deviceTypeService.save(deviceType); - return ResponseData.success(); + ResponseData responseData = new ResponseData(); + try { + DeviceType resultObjct = deviceTypeService.selectDeviceTypeById(deviceType.getId().toString()); + if (resultObjct != null) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("设备类型编号重复"); + } else { + deviceTypeService.save(deviceType); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + } + } catch (Exception ex) { + log.error("主题：新增数据库异常，异常信息{}", ex); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("数据库异常"); + } + return responseData; } /** @@ -70,7 +95,7 @@ @ResponseBody public Object delete(@RequestParam String deviceTypeId) { int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + if (count > 0) { return ResponseData.error("该类型存在绑定设备，请先解除绑定"); } deviceTypeService.removeById(Long.valueOf(deviceTypeId)); @@ -84,10 +109,10 @@ @ResponseBody public Object delete(@RequestParam("deviceTypeIds") List deviceTypeIds) { for (String deviceTypeId : deviceTypeIds) { - int count = deviceTypeService.countDeviceByType(deviceTypeId); - if(count > 0) { + int count = deviceTypeService.countDeviceByType(deviceTypeId); + if (count > 0) { String name = deviceTypeService.getById(deviceTypeId).getTypeName(); - return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定",name)); + return ResponseData.error(String.format("类型 %s 存在绑定设备，请先解除绑定", name)); } } deviceTypeService.removeByIds(deviceTypeIds); @@ -100,6 +125,7 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(DeviceType deviceType) { + deviceTypeService.updateById(deviceType); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 041cb2a..b071dc8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -32,4 +32,8 @@ DeviceInfoDto selectDeviceById(@Param("id") Long id); List getDeviceInWellInfo(@Param("id") Long id); + + DeviceDto getDetailById(@Param("id")String id); + + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index d716794..0f589db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Param; import java.io.Serializable; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,4 +22,6 @@ int countDeviceByModels(@Param("modelId") Serializable modelId); List selectModelList(@Param("deviceType") Long deviceType); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java index 500b7a4..a11ec0b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java @@ -20,4 +20,5 @@ * 根据设备类型统计设备（检查设备类型是否存在绑定设备） */ int countDeviceByType(@Param("typeId") Serializable typeId); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ca4e201..4622bdf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -211,4 +211,12 @@ AND dw.VALID=1 ) + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index da5d652..9f1b06f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -4,10 +4,10 @@ - - - - + + + + @@ -38,4 +38,15 @@ + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 385d4f8..4bc79ba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -5,6 +5,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; /** *

@@ -30,4 +31,8 @@ List selectList(Long deviceType); + + DeviceModels selectDeviceTypeById(String id); + + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 81e52b1..bbaf5db 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.Device; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -61,4 +62,5 @@ List selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus); void registerGeTui(Long id, String clientid); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 9b2d3d2..3684994 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -23,4 +23,7 @@ DeviceType selectDeviceTypeByName(String typeName); int countDeviceByType(Serializable typeId); + + DeviceType selectDeviceTypeById(String id); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java index 41129a8..34d9e6b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java @@ -9,6 +9,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; /** *

@@ -38,4 +39,13 @@ return this.baseMapper.selectModelList(deviceType); } + @Override + public DeviceModels selectDeviceTypeById(String id) { + return this.baseMapper.selectById(id); + } + + @Override + public Map getDictNameByCode() { + return this.baseMapper.getDictNameByCode(); + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index 79d7b0d..c1ee623 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -23,7 +23,7 @@ @Override public DeviceType selectDeviceTypeByName(String typeName) { QueryWrapper query = new QueryWrapper(); - query.eq("TYPE_NAME",typeName); + query.eq("TYPE_NAME", typeName); return this.baseMapper.selectOne(query); } @@ -32,4 +32,9 @@ return this.baseMapper.countDeviceByType(typeId); } + @Override + public DeviceType selectDeviceTypeById(String id) { + return this.baseMapper.selectById(id); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java index 9e75c88..2f87ba3 100644 --- a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java +++ b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java @@ -15,8 +15,8 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -//import org.apache.http.entity.mime.MultipartEntityBuilder; -//import org.apache.http.entity.mime.content.FileBody; +import org.apache.http.entity.mime.MultipartEntityBuilder; +import org.apache.http.entity.mime.content.FileBody; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; @@ -162,11 +162,11 @@ HttpPost request = new HttpPost(url); addRequestHeader(request, headerMap); -// FileBody fileBody = new FileBody(file); -// // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b -// HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); -// request.setEntity(reqEntity); -// + FileBody fileBody = new FileBody(file); + // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b + HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); + request.setEntity(reqEntity); + return (StreamClosedHttpResponse) executeHttpRequest(request); } diff --git a/casic-quartz/pom.xml b/casic-quartz/pom.xml index 2da9661..56e3929 100644 --- a/casic-quartz/pom.xml +++ b/casic-quartz/pom.xml @@ -16,14 +16,14 @@ + org.springframework.boot + spring-boot-starter-aop + + + org.quartz-scheduler quartz 2.3.0 - - com.casic - casic-core - ${core.version} - \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceModels.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceModels.java index 3676756..da06a5c 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceModels.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceModels.java @@ -44,7 +44,17 @@ @TableField("COMMUNICATION") private String communication; + /** + * 设备类型名称 + */ + @TableField(exist = false) + private String deviceTypeName; + /** + * 通信方式组名称 + */ + @TableField(exist = false) + private String communNameGroup; @Override public String toString() {