From 3e6b7608a64810a8fea09a474958039a63966373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=B6=85?= <973677575@qq.com> Date: Fri, 5 Aug 2022 15:23:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E4=B8=8E=E9=83=A8=E9=97=A8=E5=85=B3=E8=81=94=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/response/CommonResponseEnum.java | 6 + .../java/com/njcn/system/pojo/po/DeptMap.java | 57 +++++++++ .../java/com/njcn/system/pojo/vo/Dept.java | 22 ++++ .../com/njcn/system/pojo/vo/DeptConfigVO.java | 71 ++++++++++++ .../system/controller/DeptMapController.java | 104 +++++++++++++++++ .../com/njcn/system/mapper/DeptMapMapper.java | 30 +++++ .../system/mapper/mapping/DeptMapMapper.xml | 24 ++++ .../njcn/system/service/DeptMapService.java | 22 ++++ .../service/impl/DeptMapServiceImpl.java | 109 ++++++++++++++++++ 9 files changed, 445 insertions(+) create mode 100644 pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/DeptMap.java create mode 100644 pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/Dept.java create mode 100644 pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DeptConfigVO.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DeptMapMapper.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DeptMapMapper.xml create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/service/DeptMapService.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/response/CommonResponseEnum.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/response/CommonResponseEnum.java index 3123caf20..8b0a4ab72 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/response/CommonResponseEnum.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/response/CommonResponseEnum.java @@ -81,6 +81,12 @@ public enum CommonResponseEnum { DELETE_PID_UNEXIST("A0095", "不存在子节点"), FILE_EXIST("A0096", "文件已存在"), + + DEPT_EXIST("A0097", "部门id已存在"), + + DEPT_NOT_EXIST("A0098", "部门id不存在"), + + DEPT_BINDED("A0099", "部门id已绑定"), ; private final String code; diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/DeptMap.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/DeptMap.java new file mode 100644 index 000000000..1b5d4da10 --- /dev/null +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/DeptMap.java @@ -0,0 +1,57 @@ +package com.njcn.system.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/08/04 11:41 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_dept_map") +public class DeptMap extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键Id + */ + private String id; + /** + * 中心点经度 + */ + private Double longitude; + /** + * 中心点纬度 + */ + private Double latitude; + /** + * 最大值 + */ + private Integer maxValue; + /** + * 最小值 + */ + private Integer minValue; + /** + * 当前值 + */ + private Integer beValue; + /** + * 部门Id + */ + private String deptId; + /** + * 地图状态：0-离线 1-在线 + */ + private Integer mapType; + /** + * 状态：0-删除 1-正常 + */ + private Integer state; + +} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/Dept.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/Dept.java new file mode 100644 index 000000000..aa3fcc540 --- /dev/null +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/Dept.java @@ -0,0 +1,22 @@ +package com.njcn.system.pojo.vo; + +import lombok.Data; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/08/05 14:53 + */ +@Data +public class Dept { + + /** + * 部门Id + */ + private String deptId; + /** + * 部门名称 + */ + private String deptName; + +} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DeptConfigVO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DeptConfigVO.java new file mode 100644 index 000000000..7f48ee274 --- /dev/null +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DeptConfigVO.java @@ -0,0 +1,71 @@ +package com.njcn.system.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/08/04 11:09 + */ +@Data +public class DeptConfigVO implements Serializable { + + /** + * id + */ + @ApiModelProperty("主键Id") + private String id; + + /** + * 中心点经度 + */ + @ApiModelProperty("中心点经度") + private Double longitude; + + /** + * 中心点纬度 + */ + @ApiModelProperty("中心点纬度") + private Double latitude; + + /** + * 最大值 + */ + @ApiModelProperty("最大值") + private Integer maxValue; + + /** + * 最小值 + */ + @ApiModelProperty("最小值") + private Integer minValue; + + /** + * 当前值 + */ + @ApiModelProperty("当前值") + private Integer beValue; + + /** + * 地图状态：0-离线 1-在线 + */ + @ApiModelProperty("地图状态：0-离线 1-在线") + private Integer mapType; + + /** + * 部门Id + */ + @ApiModelProperty("部门Id") + private String deptId; + + /** + * 部门名称 + */ + @ApiModelProperty("部门名称") + private String deptName; + + +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java new file mode 100644 index 000000000..fd2d652d8 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java @@ -0,0 +1,104 @@ +package com.njcn.system.controller; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.common.utils.LogUtil; +import com.njcn.system.pojo.vo.DeptConfigVO; +import com.njcn.system.service.DeptMapService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/08/04 10:01 + */ +@Validated +@Slf4j +@RestController +@RequestMapping("/deptMap") +@Api(tags = "部门与地图关联配置") +@AllArgsConstructor +public class DeptMapController extends BaseController { + + private final DeptMapService deptMapService; + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/getDeptMapConfig") + @ApiOperation("查询地图与部门关联配置列表") + public HttpResult> getDeptMapConfig() { + String methodDescribe = getMethodDescribe("getDeptMapConfig"); + LogUtil.njcnDebug(log, "{}", methodDescribe, methodDescribe); + List result = deptMapService.getDeptMapConfig(); + if (Objects.isNull(result)) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/getDeptMapConfigById") + @ApiOperation("根据id查询地图与部门关联配置") + @ApiImplicitParam(name = "id", value = "参数id", required = true) + public HttpResult getDeptMapConfigById(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("getDeptMapConfigById"); + LogUtil.njcnDebug(log, "{}", methodDescribe, methodDescribe); + DeptConfigVO result = deptMapService.getDeptMapConfigById(id); + if (Objects.isNull(result)) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/getConfigByDeptId") + @ApiOperation("根据部门id查询地图关联配置") + @ApiImplicitParam(name = "deptId", value = "部门id", required = true) + public HttpResult getConfigByDeptId(@RequestParam("deptId") String deptId) { + String methodDescribe = getMethodDescribe("getConfigByDeptId"); + LogUtil.njcnDebug(log, "{}", methodDescribe, methodDescribe); + DeptConfigVO result = deptMapService.getConfigByDeptId(deptId); + if (Objects.isNull(result)) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + } + + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @ResponseBody + @PostMapping("/addDeptMapConfig") + @ApiOperation("新增地图与部门关联配置") + public HttpResult addDeptMapConfig(@RequestParam("longitude") Double longitude, + @RequestParam("latitude") Double latitude, + @RequestParam("maxValue") Integer maxValue, + @RequestParam("minValue") Integer minValue, + @RequestParam("beValue") Integer beValue, + @RequestParam("mapType") Integer mapType, + @RequestParam("deptId") String deptId) { + String methodDescribe = getMethodDescribe("addDeptMapConfig"); + boolean res = deptMapService.addDeptMapConfig(longitude, latitude, maxValue, minValue, beValue, mapType, deptId); + if (res) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } else { + throw new BusinessException(CommonResponseEnum.FAIL); + } + } + + +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DeptMapMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DeptMapMapper.java new file mode 100644 index 000000000..ad7c80f03 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DeptMapMapper.java @@ -0,0 +1,30 @@ +package com.njcn.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.system.pojo.po.DeptMap; +import com.njcn.system.pojo.vo.Dept; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/08/04 11:40 + */ +public interface DeptMapMapper extends BaseMapper { + + /** + * 查询部门id是否存在 + */ + int selectCountByDept(String deptId); + /** + * 查询部门名称 + */ + String selectDeptName(String deptId); + /** + * 查询部门名称返回集合 + */ + List selectDeptListName(@Param("deptIndexes") List deptIndexes); + +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DeptMapMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DeptMapMapper.xml new file mode 100644 index 000000000..9f3993756 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DeptMapMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/DeptMapService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/DeptMapService.java new file mode 100644 index 000000000..c041c769e --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/DeptMapService.java @@ -0,0 +1,22 @@ +package com.njcn.system.service; + +import com.njcn.system.pojo.vo.DeptConfigVO; + +import java.util.List; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/08/04 10:58 + */ +public interface DeptMapService { + + List getDeptMapConfig(); + + DeptConfigVO getDeptMapConfigById(String id); + + DeptConfigVO getConfigByDeptId(String deptId); + + boolean addDeptMapConfig(Double longitude, Double latitude, Integer maxValue, Integer minValue, Integer beValue, Integer mapType, String deptId); + +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java new file mode 100644 index 000000000..10941b1cf --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java @@ -0,0 +1,109 @@ +package com.njcn.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.system.mapper.DeptMapMapper; +import com.njcn.system.pojo.po.DeptMap; +import com.njcn.system.pojo.vo.Dept; +import com.njcn.system.pojo.vo.DeptConfigVO; +import com.njcn.system.service.DeptMapService; +import com.njcn.web.utils.RequestUtil; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/08/04 11:38 + */ +@Service +@AllArgsConstructor +public class DeptMapServiceImpl implements DeptMapService { + + private final DeptMapMapper deptMapMapper; + + @Override + public List getDeptMapConfig() { + List deptConfigVOS = new ArrayList<>(); + List deptMaps = deptMapMapper.selectList(new QueryWrapper().eq("sys_dept_map.State",1)); + if (!CollectionUtils.isEmpty(deptMaps)) { + List deptIndexes = deptMaps.stream().map(DeptMap::getDeptId).collect(Collectors.toList()); + List deptList = deptMapMapper.selectDeptListName(deptIndexes); + for (DeptMap dept: deptMaps) { + DeptConfigVO configVO = new DeptConfigVO(); + BeanUtils.copyProperties(dept, configVO); + configVO.setDeptName( + deptList.stream().filter(item -> item.getDeptId().equals(configVO.getDeptId())).collect(Collectors.toList()).get(0).getDeptName()); + deptConfigVOS.add(configVO); + } + return deptConfigVOS; + } + return null; + } + + @Override + public DeptConfigVO getDeptMapConfigById(String id) { + DeptConfigVO deptConfigVO = new DeptConfigVO(); + DeptMap deptMap = deptMapMapper.selectById(id); + if (!Objects.isNull(deptMap) && deptMap.getState()==1) { + BeanUtils.copyProperties(deptMap, deptConfigVO); + deptConfigVO.setDeptName(deptMapMapper.selectDeptName(deptMap.getDeptId())); + return deptConfigVO; + } + return null; + } + + @Override + public DeptConfigVO getConfigByDeptId(String deptId) { + DeptConfigVO deptConfigVO = new DeptConfigVO(); + DeptMap deptMap = deptMapMapper.selectOne(new QueryWrapper().eq("sys_dept_map.Dept_Id", deptId)); + if (!Objects.isNull(deptMap) && deptMap.getState()==1) { + BeanUtils.copyProperties(deptMap, deptConfigVO); + deptConfigVO.setDeptName(deptMapMapper.selectDeptName(deptMap.getDeptId())); + return deptConfigVO; + } + return null; + } + + @Override + public boolean addDeptMapConfig(Double longitude, Double latitude, Integer maxValue, Integer minValue, Integer beValue, Integer mapType, String deptId) { + if (deptMapMapper.selectCountByDept(deptId)==0) { + throw new BusinessException(CommonResponseEnum.DEPT_NOT_EXIST); + } + QueryWrapper deptMapQueryWrapper = new QueryWrapper<>(); + deptMapQueryWrapper.eq("sys_dept_map.Dept_Id",deptId); + Integer count = deptMapMapper.selectCount(deptMapQueryWrapper); + if (count==0) { + DeptMap deptMap = new DeptMap(); + deptMap.setLongitude(longitude); + deptMap.setLatitude(latitude); + deptMap.setMaxValue(maxValue); + deptMap.setMinValue(minValue); + deptMap.setBeValue(beValue); + deptMap.setMapType(mapType); + deptMap.setDeptId(deptId); + deptMap.setState(DataStateEnum.ENABLE.getCode()); + deptMap.setCreateBy(RequestUtil.getUserIndex()); + deptMap.setCreateTime(LocalDateTime.now()); + deptMap.setUpdateBy(RequestUtil.getUserIndex()); + deptMap.setUpdateTime(LocalDateTime.now()); + deptMapMapper.insert(deptMap); + return true; + } else { + throw new BusinessException(CommonResponseEnum.DEPT_BINDED); + } + + } + + +} From f7d1e6774a988bf9fc3b59a2d6b76e1484fe8aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=B6=85?= <973677575@qq.com> Date: Mon, 8 Aug 2022 10:28:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/system/service/impl/DeptMapServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java index 10941b1cf..763f90408 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java @@ -35,7 +35,7 @@ public class DeptMapServiceImpl implements DeptMapService { @Override public List getDeptMapConfig() { List deptConfigVOS = new ArrayList<>(); - List deptMaps = deptMapMapper.selectList(new QueryWrapper().eq("sys_dept_map.State",1)); + List deptMaps = deptMapMapper.selectList(new QueryWrapper().eq("sys_dept_map.State",DataStateEnum.ENABLE.getCode())); if (!CollectionUtils.isEmpty(deptMaps)) { List deptIndexes = deptMaps.stream().map(DeptMap::getDeptId).collect(Collectors.toList()); List deptList = deptMapMapper.selectDeptListName(deptIndexes); @@ -55,7 +55,7 @@ public class DeptMapServiceImpl implements DeptMapService { public DeptConfigVO getDeptMapConfigById(String id) { DeptConfigVO deptConfigVO = new DeptConfigVO(); DeptMap deptMap = deptMapMapper.selectById(id); - if (!Objects.isNull(deptMap) && deptMap.getState()==1) { + if (!Objects.isNull(deptMap) && deptMap.getState().equals(DataStateEnum.ENABLE.getCode())) { BeanUtils.copyProperties(deptMap, deptConfigVO); deptConfigVO.setDeptName(deptMapMapper.selectDeptName(deptMap.getDeptId())); return deptConfigVO; @@ -67,7 +67,7 @@ public class DeptMapServiceImpl implements DeptMapService { public DeptConfigVO getConfigByDeptId(String deptId) { DeptConfigVO deptConfigVO = new DeptConfigVO(); DeptMap deptMap = deptMapMapper.selectOne(new QueryWrapper().eq("sys_dept_map.Dept_Id", deptId)); - if (!Objects.isNull(deptMap) && deptMap.getState()==1) { + if (!Objects.isNull(deptMap) && deptMap.getState().equals(DataStateEnum.ENABLE.getCode())) { BeanUtils.copyProperties(deptMap, deptConfigVO); deptConfigVO.setDeptName(deptMapMapper.selectDeptName(deptMap.getDeptId())); return deptConfigVO; From 6f40eed4d1f287d5c3b30b2d7c16144c064f88e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=B6=85?= <973677575@qq.com> Date: Mon, 8 Aug 2022 10:48:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/system/controller/DeptMapController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java index fd2d652d8..149ce8aac 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java @@ -1,6 +1,7 @@ package com.njcn.system.controller; import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; @@ -80,7 +81,7 @@ public class DeptMapController extends BaseController { } } - @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD) @ResponseBody @PostMapping("/addDeptMapConfig") @ApiOperation("新增地图与部门关联配置") From 6b6bc6c0ebe8fd977bb9447bf6e7f606cf05b2e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=B6=85?= <973677575@qq.com> Date: Mon, 8 Aug 2022 15:44:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8E=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E5=85=B3=E8=81=94=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/enums/response/CommonResponseEnum.java | 2 ++ .../main/java/com/njcn/system/pojo/po/Config.java | 6 +++--- .../njcn/system/controller/DeptMapController.java | 15 +++++++++++++++ .../com/njcn/system/service/DeptMapService.java | 2 ++ .../system/service/impl/DeptMapServiceImpl.java | 13 ++++++++++++- 5 files changed, 34 insertions(+), 4 deletions(-) diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/response/CommonResponseEnum.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/response/CommonResponseEnum.java index 8b0a4ab72..99c2727c3 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/response/CommonResponseEnum.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/response/CommonResponseEnum.java @@ -87,6 +87,8 @@ public enum CommonResponseEnum { DEPT_NOT_EXIST("A0098", "部门id不存在"), DEPT_BINDED("A0099", "部门id已绑定"), + + ID_NOT_EXIST("A0099", "id不存在"), ; private final String code; diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Config.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Config.java index ac7ddee96..15be38794 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Config.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Config.java @@ -2,11 +2,11 @@ package com.njcn.system.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.math.BigDecimal; - import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + /** * * @author hongawen @@ -42,7 +42,7 @@ public class Config extends BaseEntity { /** * 审计日志存储时间（1-6个月，默认3个月） */ - private Boolean logTime; + private Integer logTime; /** * 状态：0-删除 1-正常 diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java index 149ce8aac..31b4bf2b0 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java @@ -101,5 +101,20 @@ public class DeptMapController extends BaseController { } } + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE) + @GetMapping("/removeDeptMapConfigById") + @ApiOperation("根据id删除地图与部门关联配置") + @ApiImplicitParam(name = "id", value = "参数id", required = true) + public HttpResult removeDeptMapConfigById(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("removeDeptMapConfigById"); + LogUtil.njcnDebug(log, "{}", methodDescribe, methodDescribe); + boolean res = deptMapService.removeDeptMapConfigById(id); + if (res) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } else { + throw new BusinessException(CommonResponseEnum.ID_NOT_EXIST); + } + } + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/DeptMapService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/DeptMapService.java index c041c769e..f28b23e90 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/DeptMapService.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/DeptMapService.java @@ -19,4 +19,6 @@ public interface DeptMapService { boolean addDeptMapConfig(Double longitude, Double latitude, Integer maxValue, Integer minValue, Integer beValue, Integer mapType, String deptId); + boolean removeDeptMapConfigById(String id); + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java index 763f90408..b18967512 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java @@ -92,7 +92,7 @@ public class DeptMapServiceImpl implements DeptMapService { deptMap.setBeValue(beValue); deptMap.setMapType(mapType); deptMap.setDeptId(deptId); - deptMap.setState(DataStateEnum.ENABLE.getCode()); + // deptMap.setState(DataStateEnum.ENABLE.getCode()); deptMap.setCreateBy(RequestUtil.getUserIndex()); deptMap.setCreateTime(LocalDateTime.now()); deptMap.setUpdateBy(RequestUtil.getUserIndex()); @@ -105,5 +105,16 @@ public class DeptMapServiceImpl implements DeptMapService { } + @Override + public boolean removeDeptMapConfigById(String id) { + DeptMap deptMap = deptMapMapper.selectOne(new QueryWrapper().eq("sys_dept_map.Id", id)); + if (!Objects.isNull(deptMap) && deptMap.getState().equals(DataStateEnum.ENABLE.getCode())) { + deptMap.setState(DataStateEnum.DELETED.getCode()); + deptMapMapper.updateById(deptMap); + return true; + } + return false; + } + }