From c2ba419b7d2d092e1a9b2ee197382a331a28aa07 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Sun, 18 Sep 2022 17:19:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BF=90=E7=BB=B4=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/v2.1.sql | 5 +- .../controller/WorkDeptController.java | 12 +++-- .../activity/domain/XhpcWorkDeptDomain.java | 6 ++- .../activity/domain/XhpcWorkUserDomain.java | 7 +++ .../enums/WorkOrderTypeMeasureEnum.java | 50 +++++++++++++++++++ .../src/main/resources/bootstrap.yml | 4 +- .../resources/mapper/XhpcWorkDeptMapper.xml | 14 ++++-- .../src/main/resources/bootstrap.yml | 4 +- 8 files changed, 90 insertions(+), 12 deletions(-) create mode 100644 xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/enums/WorkOrderTypeMeasureEnum.java diff --git a/sql/v2.1.sql b/sql/v2.1.sql index bd139c87..d01e871e 100644 --- a/sql/v2.1.sql +++ b/sql/v2.1.sql @@ -1118,4 +1118,7 @@ ALTER TABLE `xhpc_work_user` ALTER TABLE `xhpc_work_user` ADD COLUMN `operator_ids` text COMMENT '运营商ID（用逗号分隔）' AFTER `type`; ALTER TABLE `xhpc_work_user` - ADD COLUMN `station_ids` text COMMENT '场站ID（用逗号分隔）' AFTER `operator_ids`; \ No newline at end of file + ADD COLUMN `station_ids` text COMMENT '场站ID（用逗号分隔）' AFTER `operator_ids`; + +ALTER TABLE `xhpc_work_dept` + ADD COLUMN `type` int(4) NULL DEFAULT null COMMENT '人员类型（1-管理员，2-运维人员）' AFTER `status`; \ No newline at end of file diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkDeptController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkDeptController.java index fea1c9c2..075786c0 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkDeptController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkDeptController.java @@ -29,34 +29,40 @@ public class WorkDeptController extends BaseController { @GetMapping("/getPage") - public TableDataInfo getPage(HttpServletRequest request) { + public TableDataInfo getPage(HttpServletRequest request, + @RequestParam(required = false) Integer type) { LoginUser loginUser = logUserUtils.getLogUser(request); startPage(); Map params = new HashMap<>(); params.put("tenantId", loginUser.getTenantId()); + params.put("type", type); return getDataTable(workDeptService.getPage(params)); } @GetMapping("/getList") - public R getList(HttpServletRequest request) { + public R getList(HttpServletRequest request, + @RequestParam(required = false) Integer type) { LoginUser loginUser = logUserUtils.getLogUser(request); Map params = new HashMap<>(); params.put("tenantId", loginUser.getTenantId()); + params.put("type", type); return R.ok(workDeptService.getList(params)); } @GetMapping("/getTree") - public R getTree(HttpServletRequest request) { + public R getTree(HttpServletRequest request, + @RequestParam(required = false) Integer type) { LoginUser loginUser = logUserUtils.getLogUser(request); Map params = new HashMap<>(); params.put("tenantId", loginUser.getTenantId()); + params.put("type", type); return R.ok(workDeptService.getTree(params)); } diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkDeptDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkDeptDomain.java index a10b5910..742f61a3 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkDeptDomain.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkDeptDomain.java @@ -7,7 +7,7 @@ import java.util.Date; /** * xhpc_work_dept - * @author + * @author */ @Data public class XhpcWorkDeptDomain implements Serializable { @@ -31,6 +31,10 @@ public class XhpcWorkDeptDomain implements Serializable { */ private Short sort; + /** + * 人员类型（1-管理员，2-运维人员） + */ + private Integer type; /** * 上级部门ID */ diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkUserDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkUserDomain.java index 44f01b75..a87d3fbd 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkUserDomain.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkUserDomain.java @@ -57,7 +57,14 @@ public class XhpcWorkUserDomain implements Serializable { */ private Integer type; + /** + * 运营商ID，用逗号分隔 + */ private String operatorIds; + + /** + * 场站ID，用逗号分隔 + */ private String stationIds; /** diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/enums/WorkOrderTypeMeasureEnum.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/enums/WorkOrderTypeMeasureEnum.java new file mode 100644 index 00000000..3c7a000a --- /dev/null +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/enums/WorkOrderTypeMeasureEnum.java @@ -0,0 +1,50 @@ +package com.xhpc.activity.enums; + +public enum WorkOrderTypeMeasureEnum { + + SOFTWARE_UPGRADE(1, "自动升级"), + RATEMODEL_SYNC(2, "校时校价"), + REBOOT(3, "重启"), + RATEMODEL_NEW(4, "下发新费率") + ; + + private final Integer code; + private final String name; + + + WorkOrderTypeMeasureEnum(Integer code, String name){ + this.code = code; + this.name = name; + } + + //根据code获取name + public static String getNameByCode(Integer code) { + for (WorkOrderTypeMeasureEnum typeEnum : WorkOrderTypeMeasureEnum.values()) { + if (typeEnum.code.equals(code)) { + return typeEnum.name; + } + } + return ""; + } + + //根据name获取code + public static Integer getCodeByName(String name) { + for (WorkOrderTypeMeasureEnum typeEnum : WorkOrderTypeMeasureEnum.values()) { + //移除交办 + if (typeEnum.name.equals(name)) { + return typeEnum.code; + } + } + return null; + } + + public Integer getCode() { + + return code; + } + + public String getName() { + + return name; + } +} diff --git a/xhpc-modules/xhpc-activity/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-activity/src/main/resources/bootstrap.yml index 64326cc2..0f17bfa1 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-activity/src/main/resources/bootstrap.yml @@ -19,10 +19,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.31.183.135:8848 + server-addr: 127.0.0.1:8858 config: # 配置中心地址 - server-addr: 172.31.183.135:8848 + server-addr: 127.0.0.1:8858 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml index 914c2b63..36974233 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml @@ -7,6 +7,7 @@ + @@ -16,7 +17,7 @@ - work_dept_id, dept_name, code, sort, parent_dept_id, `status`, del_flag, tenant_id, + work_dept_id, dept_name, code, sort, parent_dept_id, type, `status`, del_flag, tenant_id, create_time, create_by, update_time, update_by @@ -35,6 +36,9 @@ and parent_dept_id=#{params.parentDeptId} + + and type=#{params.parentDeptId} + and find_in_set(parent_dept_id, #{params.parentDeptIds}) @@ -56,6 +60,9 @@ and tenant_id=#{params.tenantId} + + and type=#{params.parentDeptId} + and parent_dept_id=#{params.parentDeptId} @@ -100,11 +107,11 @@ insert into xhpc_work_dept (dept_name, code, sort, - parent_dept_id, `status`, del_flag, + parent_dept_id, type, `status`, del_flag, tenant_id, create_time, create_by, update_time, update_by) values (#{deptName,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{sort,jdbcType=SMALLINT}, - #{parentDeptId,jdbcType=BIGINT}, #{status,jdbcType=SMALLINT}, 0, + #{parentDeptId,jdbcType=BIGINT}, #{type}, #{status,jdbcType=SMALLINT}, 0, #{tenantId,jdbcType=VARCHAR}, SYSDATE(), #{createBy,jdbcType=VARCHAR}, SYSDATE(), #{updateBy,jdbcType=VARCHAR}) @@ -116,6 +123,7 @@ code = #{code,jdbcType=VARCHAR}, sort = #{sort,jdbcType=SMALLINT}, parent_dept_id = #{parentDeptId,jdbcType=BIGINT}, + type=#{type}, `status` = #{status,jdbcType=SMALLINT}, update_time = SYSDATE(), update_by = #{updateBy,jdbcType=VARCHAR} diff --git a/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml index df3a5bc9..9503d966 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml @@ -18,10 +18,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.31.183.135:8848 + server-addr: 127.0.0.1:8858 config: # 配置中心地址 - server-addr: 172.31.183.135:8848 + server-addr: 127.0.0.1:8858 # 配置文件格式 file-extension: yml # 共享配置