From ab6a0b43df667f1296e7005c7b06b00df92e2cc2 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 27 Mar 2024 17:35:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/background/dto/AreaDto.java | 1 + .../entity/background/vo/AreaVo.java | 5 + .../entity/background/vo/GtVo.java | 60 +++++++++ .../entity/background/vo/UserProVo.java | 105 +++++++++++++++ .../entity/system/SystemGlobal.java | 23 +++- .../handler/GlobalExceptionHandler.java | 20 ++- ...saDecryptResponseGatewayFilterFactory.java | 7 + .../controller/TbAreaController.java | 30 +++++ .../controller/UserProController.java | 97 ++++++++++++++ .../background/mapper/TbAreaMapper.java | 8 ++ .../background/mapper/UserProMapper.java | 50 +++++++ .../background/service/TbAreaService.java | 15 +++ .../background/service/UserProService.java | 47 +++++++ .../service/impl/DeviceServiceImpl.java | 2 +- .../service/impl/TbAreaServiceImpl.java | 48 +++++++ .../service/impl/UserProServiceImpl.java | 125 ++++++++++++++++++ .../main/resources/mapper/DeviceMapper.xml | 2 +- .../main/resources/mapper/TbAreaMapper.xml | 30 ++++- .../main/resources/mapper/UserProMapper.xml | 86 ++++++++++++ 19 files changed, 744 insertions(+), 17 deletions(-) create mode 100644 securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/GtVo.java create mode 100644 securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/UserProVo.java create mode 100644 securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/UserProController.java create mode 100644 securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/UserProMapper.java create mode 100644 securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/UserProService.java create mode 100644 securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/UserProServiceImpl.java create mode 100644 securitycontrol-model/securitycontrol-background/src/main/resources/mapper/UserProMapper.xml diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/AreaDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/AreaDto.java index 9afef66..d2d8c6c 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/AreaDto.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/AreaDto.java @@ -23,6 +23,7 @@ public class AreaDto { */ private String areaId; + private String keyWord; } diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/AreaVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/AreaVo.java index fa30977..d682827 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/AreaVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/AreaVo.java @@ -55,6 +55,11 @@ public class AreaVo { * 杆塔名称 */ private String gtName; + /** + * 是否是有些爱你空间 + */ + private String areaType; + diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/GtVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/GtVo.java new file mode 100644 index 0000000..f72944d --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/GtVo.java @@ -0,0 +1,60 @@ +package com.securitycontrol.entity.background.vo; + +import lombok.Data; + +/** + * 工程杆塔信息 + * @author 黑子 + */ +@Data +public class GtVo { + /** + * 杆塔名称 + */ + private String gtName; + /** + * + */ + private String lat; + + private String lon; + /** + * 杆塔编号 + */ + private String gtCode; + /** + * 杆塔id + */ + private String gtId; + /** + * 标段编码 + */ + private String bidCode; + /** + *工程名称 + */ + private String proName; + /** + * 当前工序id + */ + private String nowGx; + /** + * 更新时间 + */ + private String updateTime; + /** + * 创建时间 + */ + private String createTime; + /** + * 工序名称 + */ + private String gxName; + /** + * 关键字名称 + */ + private String keyWord; + + + +} diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/UserProVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/UserProVo.java new file mode 100644 index 0000000..4d03595 --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/UserProVo.java @@ -0,0 +1,105 @@ +package com.securitycontrol.entity.background.vo; + +import lombok.Data; + +/** + * @author 黑子 + */ +@Data +public class UserProVo { + /** + * 用户id + */ + private String userId; + /** + * 用户名称 + */ + private String userName; + /** + * 登录名称 + */ + private String loginName; + /** + * 标段编码 + */ + private String bidCode; + /** + * 标段名称 + */ + private String bidName; + /** + * 状态 + */ + private String status; + /** + * 角色名称 + */ + private String roleName; + /** + * 工程数量 + */ + private String proNum; + + /** + * 部门名称 + */ + private String deptName; + /** + * 类型 + */ + private String type; + + private String orgId; + /** + * 组织机构名称 + */ + private String orgName; + /** + * 地市名称 + */ + private String cityName; + /** + * 关键字 + */ + private String keyWord; + /** + * 监理单位 + */ + private String jlUnit; + /** + * 施工单位 + */ + private String sgUnit; + /** + * 计划开始时间 + */ + private String planStartTime; + /** + * 计划结束时间 + */ + private String planEndTime; + /** + * 开始时间 + */ + private String startTime; + /** + * 结束时间 + */ + private String endTime; + /** + * 工程类型1 + */ + private String proType; + /** + * 项目经理 + */ + private String manager; + /** + * 当前工序 + */ + private String nowGx; + /** + * 角色类型 + */ + private String roleCode; +} diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java index 1cd9599..267b1cc 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java @@ -15,13 +15,24 @@ public class SystemGlobal { * 成功数据数量 */ public final static int SUCCESS_NUM=1; + /** + * 地市 + */ + public final static String ROLE_DS="city"; + /** + * 值班员 + */ + public final static String ROLE_ZB="duty"; + /** + * 项目经理 + */ + public final static String ROLE_MANAGE="manager"; + /** + * 管理员 + */ + public final static String ROLE_MAIN="administrators"; - - - - - - + public final static String BODY_ERROR="Required request body is missing:"; } diff --git a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/handler/GlobalExceptionHandler.java b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/handler/GlobalExceptionHandler.java index ac9393f..53a72d3 100644 --- a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/handler/GlobalExceptionHandler.java +++ b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/handler/GlobalExceptionHandler.java @@ -32,6 +32,10 @@ public class GlobalExceptionHandler { private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class); + public final static String BODY_ERROR="Required request body is missing:"; + + public final static String DATA_ERROR="Data truncation: Data too long for"; + /** * 权限码异常 */ @@ -83,8 +87,16 @@ public class GlobalExceptionHandler * 拦截未知的运行时异常 */ @ExceptionHandler(RuntimeException.class) - public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) - { + public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) { + String msg=e.getMessage(); + if (StringUtils.hasText(msg)) { + if (msg.contains(BODY_ERROR)){ + return AjaxResult.error("post请求body参数不能为空"); + } + if (msg.contains(DATA_ERROR)){ + return AjaxResult.error("数据长度过长"); + } + } String requestUri = request.getRequestURI(); log.error("请求地址'{}',发生未知异常.", requestUri, e); return AjaxResult.error(e.getMessage()); @@ -94,8 +106,8 @@ public class GlobalExceptionHandler * 系统异常 */ @ExceptionHandler(Exception.class) - public AjaxResult handleException(Exception e, HttpServletRequest request) - { + public AjaxResult handleException(Exception e, HttpServletRequest request) { + String requestUri = request.getRequestURI(); log.error("请求地址'{}',发生系统异常.", requestUri, e); return AjaxResult.error(e.getMessage()); diff --git a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/RsaDecryptResponseGatewayFilterFactory.java b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/RsaDecryptResponseGatewayFilterFactory.java index de9f518..7e2ea8d 100644 --- a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/RsaDecryptResponseGatewayFilterFactory.java +++ b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/RsaDecryptResponseGatewayFilterFactory.java @@ -45,7 +45,14 @@ class RsaDecryptResponseGatewayFilterFactory extends AbstractGatewayFilterFactor @Override public GatewayFilter apply(Object config) { return (exchange, chain) -> { + + ServerHttpRequest serverHttpRequest = exchange.getRequest(); + String head= serverHttpRequest.getHeaders().getFirst("decrypt"); + if(StringHelper.isNotEmpty(head)&& "decrypt".equals(head)){ + return chain.filter(exchange); + } + if(!AQ_JM){ return chain.filter(exchange); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TbAreaController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TbAreaController.java index 38ebb39..6316166 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TbAreaController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TbAreaController.java @@ -11,6 +11,7 @@ import com.securitycontrol.entity.background.dto.AreaDto; import com.securitycontrol.entity.background.dto.DeviceDto; import com.securitycontrol.entity.background.vo.AreaVo; import com.securitycontrol.entity.background.vo.DeviceVo; +import com.securitycontrol.entity.background.vo.GtVo; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +23,7 @@ import java.util.List; /** * 区域管理接口 + * 杆塔 管理接口 * @author 黑子 */ @RestController @@ -47,6 +49,34 @@ public class TbAreaController extends BaseController { } } + @ApiOperation(value = "查询杆塔列表") + @GetMapping("getGtList") + @Log(title = "杆塔管理", menu = "基础管理->区域管理", grade = OperationType.QUERY_BUSINESS, details = "查询杆塔信息", type = "业务日志") + public TableDataInfo getGtList(AreaDto dto) { + try{ + startPage(); + List list = service.getGtList(dto); + return getDataTable(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBad(new ArrayList<>(),"请求出错了"); + } + } + + /** + * 新增区域 + * + * @param dto + * @return + */ + @PostMapping("addGtData") + @Log(title = "新增区域", menu = "基础管理->区域管理", grade = OperationType.QUERY_BUSINESS, details = "新增区域", type = "业务日志") + public Result addGtData(@RequestBody @Valid GtVo dto) { + return service.addGtData(dto); + } + + + /** * 新增区域 * diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/UserProController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/UserProController.java new file mode 100644 index 0000000..fab6d78 --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/UserProController.java @@ -0,0 +1,97 @@ +package com.securitycontrol.background.controller; + +import com.securitycontrol.background.service.DeviceService; +import com.securitycontrol.background.service.UserProService; +import com.securitycontrol.common.core.domain.Result; +import com.securitycontrol.common.core.web.controller.BaseController; +import com.securitycontrol.common.core.web.page.TableDataInfo; +import com.securitycontrol.common.log.annotation.Log; +import com.securitycontrol.common.log.enums.OperationType; +import com.securitycontrol.entity.background.dto.DeviceDto; +import com.securitycontrol.entity.background.vo.DeviceVo; +import com.securitycontrol.entity.background.vo.UserProVo; +import com.securitycontrol.entity.system.SystemGlobal; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.ArrayList; +import java.util.List; + +/** + * 用户工程 分配 + * 接口层 + * @author 黑子 + */ +@RestController +@RequestMapping("/user/pro/") +@Slf4j +public class UserProController extends BaseController { + + @Autowired + private UserProService service; + + + @GetMapping("getUserList") + @Log(title = "用户分配", menu = "基础管理->用户分配", grade = OperationType.QUERY_BUSINESS, details = "查询用户分配列表", type = "业务日志") + public TableDataInfo getUserList(UserProVo dto) { + try{ + dto.setRoleCode(SystemGlobal.ROLE_MANAGE); + startPage(); + List list = service.getUserList(dto); + return getDataTable(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBad(new ArrayList<>(),"请求出错了"); + } + } + + @GetMapping("getFpProList") + public TableDataInfo getFpProList(UserProVo dto) { + try{ + startPage(); + List list = service.getFpProList(dto); + return getDataTable(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBad(new ArrayList<>(),"请求出错了"); + } + } + + @GetMapping("getProList") + public TableDataInfo getProList(UserProVo dto) { + try{ + startPage(); + List list = service.getProList(dto); + return getDataTable(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBad(new ArrayList<>(),"请求出错了"); + } + } + + /** + * 新增用户工程 + * @param dto + * @return + */ + @PostMapping("addUserPro") + @Log(title = "分配工程", menu = "设备管理->新增设备", grade = OperationType.QUERY_BUSINESS, details = "分配工程", type = "业务日志") + public Result addUserPro(@RequestBody @Valid UserProVo dto) { + return service.addUserPro(dto); + } + + /** + * 删除 工程 + * @param dto + * @return + */ + @PostMapping("delUserPro") + @Log(title = "移除工程", menu = "设备管理->新增设备", grade = OperationType.QUERY_BUSINESS, details = "移除已分配的工程", type = "业务日志") + public Result delUserPro(@RequestBody @Valid UserProVo dto) { + return service.delUserPro(dto); + } + +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TbAreaMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TbAreaMapper.java index f9afd14..f8165b1 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TbAreaMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TbAreaMapper.java @@ -2,6 +2,7 @@ package com.securitycontrol.background.mapper; import com.securitycontrol.entity.background.dto.AreaDto; import com.securitycontrol.entity.background.vo.AreaVo; +import com.securitycontrol.entity.background.vo.GtVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -47,4 +48,11 @@ public interface TbAreaMapper { * @return */ int deleteArea(@Param("areaId") String id); + + /** + * 查询杆塔信息 + * @param dto + * @return + */ + List getGtList(AreaDto dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/UserProMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/UserProMapper.java new file mode 100644 index 0000000..061537b --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/UserProMapper.java @@ -0,0 +1,50 @@ +package com.securitycontrol.background.mapper; + +import com.securitycontrol.entity.background.vo.UserProVo; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 用户工程 分配 + * @author 黑子 + */ +@Repository +public interface UserProMapper { + + /** + * 查询用户结合 + * @param dto + * @return + */ + List getUserList(UserProVo dto); + + /** + * 已分配用户信息集合 + * @param dto + * @return + */ + List getFpProList(UserProVo dto); + + /** + * 查询未分配的工程数据 + * @param dto + * @return + */ + List getProList(UserProVo dto); + + /** + * 删除已分配的用户编码 + * @param userId + * @param bidCode + */ + void deleteUserProByCode(@Param("userId") String userId,@Param("bidCode") String bidCode); + + /** + * 新增用户 工程 + * @param userId + * @param bidCode + */ + void addUserPro(@Param("userId")String userId, @Param("bidCode") String bidCode); +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TbAreaService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TbAreaService.java index f1ec715..f4e59a3 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TbAreaService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TbAreaService.java @@ -4,6 +4,7 @@ package com.securitycontrol.background.service; import com.securitycontrol.common.core.domain.Result; import com.securitycontrol.entity.background.dto.AreaDto; import com.securitycontrol.entity.background.vo.AreaVo; +import com.securitycontrol.entity.background.vo.GtVo; import java.util.List; @@ -40,4 +41,18 @@ public interface TbAreaService { * @return */ Result deleteArea(AreaDto dto); + + /** + * 查询杆塔信息集合 + * @param dto + * @return + */ + List getGtList(AreaDto dto); + + /** + * 新增杆塔信息 + * @param dto + * @return + */ + Result addGtData(GtVo dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/UserProService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/UserProService.java new file mode 100644 index 0000000..697e59f --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/UserProService.java @@ -0,0 +1,47 @@ +package com.securitycontrol.background.service; + +import com.securitycontrol.common.core.domain.Result; +import com.securitycontrol.entity.background.vo.UserProVo; + +import java.util.List; + +/** + * 用户 工程分配 业务接口层 + * @author 黑子 + */ +public interface UserProService { + /** + * 用户分配 查询集合 + * @param dto + * @return + */ + List getUserList(UserProVo dto); + + /** + * 查询 已分配用户的工程数量 + * @param dto + * @return + */ + List getFpProList(UserProVo dto); + + /** + * 查询 工程信息 + * @param dto + * @return + */ + List getProList(UserProVo dto); + + /** + * 新增用户工程 + * @param dto + * @return + */ + Result addUserPro(UserProVo dto); + + /** + * 删除用已分配的工程 + * @param dto + * @return + */ + Result delUserPro(UserProVo dto); +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceServiceImpl.java index a5671f8..4a4d20c 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceServiceImpl.java @@ -76,7 +76,7 @@ public class DeviceServiceImpl implements DeviceService { return Result.fail("系统升级中,请稍后重试"); }catch (Exception e){ log.error(e.toString(),e); - return Result.fail("新增失败"); + return Result.fail("系统升级中,请稍后重试"); } } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TbAreaServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TbAreaServiceImpl.java index 53e16a2..695cc8c 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TbAreaServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TbAreaServiceImpl.java @@ -7,6 +7,7 @@ import com.securitycontrol.common.core.utils.aes.StringHelper; import com.securitycontrol.common.core.utils.uuid.IdUtils; import com.securitycontrol.entity.background.dto.AreaDto; import com.securitycontrol.entity.background.vo.AreaVo; +import com.securitycontrol.entity.background.vo.GtVo; import com.securitycontrol.entity.system.SystemGlobal; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -111,12 +112,59 @@ public class TbAreaServiceImpl implements TbAreaService { } } + /** + * 杆塔信息查询 + * @param dto + * @return + */ + @Override + public List getGtList(AreaDto dto) { + return mapper.getGtList(dto); + } + + /** + * + * @param dto + * @return + */ + @Override + public Result addGtData(GtVo dto) { + try{ + String result=checkData2(dto); + return null; + + }catch (Exception e){ + log.error(e.toString()); + return Result.fail("系统升级中,请稍后重试!"); + } + } + + + /** + * 数据校验 + * @param dto + * @return + */ + public String checkData2(GtVo dto){ + if (StringHelper.isEmpty(dto.getGtName())){ + return "杆塔名称不能为空"; + } + if (StringHelper.isEmpty(dto.getBidCode())) { + return "请选择工程"; + } + return null; + } + + /** * 数据校验 * @param dto * @return */ public String checkData(AreaVo dto){ + if(StringHelper.isEmpty(dto.getAreaType())){ + dto.setAreaType("0"); + } String bidCode=dto.getBidCode(); if (StringHelper.isEmpty(bidCode)) { return "请选择工程"; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/UserProServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/UserProServiceImpl.java new file mode 100644 index 0000000..c8a6f30 --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/UserProServiceImpl.java @@ -0,0 +1,125 @@ +package com.securitycontrol.background.service.impl; + +import com.securitycontrol.background.mapper.UserProMapper; +import com.securitycontrol.background.service.UserProService; +import com.securitycontrol.common.core.domain.Result; +import com.securitycontrol.common.core.utils.aes.StringHelper; +import com.securitycontrol.common.log.annotation.Log; +import com.securitycontrol.entity.background.vo.UserProVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + * + * @author 黑子 + */ +@Service +@Slf4j +public class UserProServiceImpl implements UserProService { + + @Autowired + private UserProMapper mapper; + + /** + * + * @param dto + * @return + */ + @Override + public List getUserList(UserProVo dto) { + return mapper.getUserList(dto); + } + + @Override + public List getFpProList(UserProVo dto) { + return mapper.getFpProList(dto); + } + + /** + * 查询 已分配/未分配的工程 + * @param dto + * @return + */ + @Override + public List getProList(UserProVo dto) { + return mapper.getProList(dto); + } + + /** + * 用户工程分配 + * @param dto + * @return + */ + @Override + public Result addUserPro(UserProVo dto) { + try{ + //删除 + String result=checkData(dto); + if (StringHelper.isNotEmpty(result)) { + return Result.fail(result); + } + String userId=dto.getUserId(); + List list= Arrays.asList(dto.getBidCode().split("@")); + //工程分配 + list.forEach(bidCode->{ + mapper.addUserPro(userId,bidCode); + }); + return Result.ok("工程分配成功","工程分配成功"); + }catch (Exception e){ + log.error(e.toString(),e); + return Result.fail("系统升级中,请稍后重试"); + } + } + + /** + * 删除已分配的工程信息 + * @param dto + * @return + */ + @Override + public Result delUserPro(UserProVo dto) { + try{ + String userId=dto.getUserId(); + if (StringHelper.isEmpty(dto.getUserId())){ + return Result.fail("用户不能为空"); + } + if(StringHelper.isEmpty(dto.getBidCode())){ + mapper.deleteUserProByCode(userId,""); + }else{ + + List list= Arrays.asList(dto.getBidCode().split("@")); + //工程分配 + list.forEach(bidCode->{ + mapper.deleteUserProByCode(userId,bidCode); + }); + } + + + return Result.fail("工程分配成功"); + }catch (Exception e){ + log.error(e.toString(),e); + return Result.fail("系统升级中,请稍后重试"); + } + } + + /** + * 删除用户工程 + * @param dto + * @return + */ + public String checkData(UserProVo dto) { + if (StringHelper.isEmpty(dto.getUserId())){ + return "用户不能为空"; + } + if (StringHelper.isEmpty(dto.getBidCode())){ + return "请选择工程"; + } + return null; + } + + +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml index b21ec2c..21230ba 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml @@ -7,7 +7,7 @@ - + diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml index 81e2df2..41a4ba0 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml @@ -13,34 +13,54 @@ + insert into tb_area(area_id,area_name,bid_code,remarks, - area_code,create_time, gt_id,del_flag)value ( - #{areaId},#{areaName},#{bidCode},#{remarks},#{areaCode},now(),#{gtId},0) + area_code,create_time, gt_id,del_flag,area_type)value ( + #{areaId},#{areaName},#{bidCode},#{remarks},#{areaCode},now(),#{gtId},0,#{areaType}) update tb_area set area_name=#{areaName},bid_code=#{bidCode},remarks=#{remarks},gt_id=#{gtId}, - area_code=#{areaCode},update_time=now() + area_code=#{areaCode},update_time=now(),area_type=#{areaType} where area_id=#{areaId} update tb_area set del_flag=1 where area_id=#{areaId} - select area_id,area_name,pro.bid_code, remarks,area_code,pro.pro_name, - area.create_time,area.update_time, area.gt_id,gt.gt_name + area.create_time,area.update_time, area.gt_id,gt.gt_name,area.area_type from tb_area area left join tb_project pro on pro.bid_code=area.bid_code and pro.del_flag=0 LEFT JOIN t_pro_gt gt on area.gt_id=gt.gt_id and gt.del_flag=0 where area.del_flag=0 + + AND INSTR(area_name,#{keyWord}) > 0 + + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/UserProMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/UserProMapper.xml new file mode 100644 index 0000000..a165468 --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/UserProMapper.xml @@ -0,0 +1,86 @@ + + + + + insert into tb_user_pro(user_id ,bid_cod ,del_flag,times) + values(#{userId}, #{bidCode},0, now()) + + + UPDATE tb_user_pro SET del_flag=1 where user_id=#{userId} + + and bid_cod=#{bidCode} + + + + + + + \ No newline at end of file