更新运维系统

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`;
+    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`;

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<String, Object> 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<String, Object> 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<String, Object> params = new HashMap<>();
         params.put("tenantId", loginUser.getTenantId());
+        params.put("type", type);
         return R.ok(workDeptService.getTree(params));
     }
 

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
      */

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;
 
     /**

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;
+    }
+}

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
         # 共享配置

xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml

@@ -7,6 +7,7 @@
     <result column="code" jdbcType="VARCHAR" property="code" />
     <result column="sort" jdbcType="SMALLINT" property="sort" />
     <result column="parent_dept_id" jdbcType="BIGINT" property="parentDeptId" />
+    <result column="type" property="type" />
     <result column="status" jdbcType="SMALLINT" property="status" />
     <result column="del_flag" jdbcType="SMALLINT" property="delFlag" />
     <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
@@ -16,7 +17,7 @@
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
   </resultMap>
   <sql id="Base_Column_List">
-    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
   </sql>
 
@@ -35,6 +36,9 @@
     <if test="params.parentDeptId !=null and params.parentDeptId!=''">
       and parent_dept_id=#{params.parentDeptId}
     </if>
+    <if test="params.type !=null and params.type!=''">
+      and type=#{params.parentDeptId}
+    </if>
    <choose>
      <when test="params.parentDeptIds !=null and params.parentDeptIds!=''">
        and find_in_set(parent_dept_id, #{params.parentDeptIds})
@@ -56,6 +60,9 @@
     <if test="params.tenantId !=null and params.tenantId!=''">
       and tenant_id=#{params.tenantId}
     </if>
+      <if test="params.type !=null and params.type!=''">
+        and type=#{params.parentDeptId}
+      </if>
       <choose>
         <when test="params.parentDeptId !=null and params.parentDeptId!=''">
           and parent_dept_id=#{params.parentDeptId}
@@ -100,11 +107,11 @@
 
   <insert id="insert" keyColumn="work_dept_id" keyProperty="workDeptId" parameterType="com.xhpc.activity.domain.XhpcWorkDeptDomain" useGeneratedKeys="true">
     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})
   </insert>
@@ -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}

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
         # 共享配置