增加字段

2022-08-24 11:30:31 +08:00 · 2022-08-24 11:30:31 +08:00 · 1a00701bd4
commit 1a00701bd4
parent 0c5bcb9dff
6 changed files with 107 additions and 16 deletions
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderDomain.java
@ -8,7 +8,7 @@ import java.util.List;

 /**
 * xhpc_work_order
- * @author 
+ * @author
 */
@Data
 public class XhpcWorkOrderDomain implements Serializable {
@ -51,6 +51,8 @@ public class XhpcWorkOrderDomain implements Serializable {
     */
    private String serialNumber;

+    private Long stationId;
+
    /**
     * 故障原因
     */
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkTypeDictDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkTypeDictDomain.java
@ -25,6 +25,24 @@ public class XhpcWorkTypeDictDomain implements Serializable {
     */
    private Integer parentTypeId;

+
+    /**
+     * 是否自动派发（0-不自动派发，1-自动派发）
+     */
+    private Integer autoSend = 0;
+
+    /**
+     * 自动派发的人员
+     */
+    private Integer userId;
+
+    /**
+     * 是否自动采取应急措施（0-不自动采取，1-自动）
+     */
+    private Integer autoRun;
+    private Integer measure;
+
+
    /**
     * 状态0-禁用，1-启用
     */
--- 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
@ -7,7 +7,7 @@ import java.util.Date;

 /**
 * xhpc_work_user
- * @author 
+ * @author
 */
@Data
 public class XhpcWorkUserDomain implements Serializable {
@ -51,6 +51,15 @@ public class XhpcWorkUserDomain implements Serializable {
     */
    private Short isLeader;

+
+    /**
+     * 人员类型（1-管理员，2-运维人员）
+     */
+    private Integer type;
+
+    private String operatorIds;
+    private String stationIds;
+
    /**
     * 状态（0-未启用，1-正常）
     */
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml
@ -9,6 +9,7 @@
    <result column="fault_time" jdbcType="TIMESTAMP" property="faultTime" />
    <result column="device_type" jdbcType="VARCHAR" property="deviceType" />
    <result column="serial_number" jdbcType="VARCHAR" property="serialNumber" />
+    <result column="station_id" javaType="BIGINT" property="stationId" />
    <result column="reason" jdbcType="VARCHAR" property="reason" />
    <result column="disposal_method" jdbcType="VARCHAR" property="disposalMethod" />
    <result column="status" jdbcType="SMALLINT" property="status" />
@ -22,7 +23,7 @@

  </resultMap>
  <sql id="Base_Column_List">
-    o.work_order_id, o.`type`, o.title, o.content, o.fault_time, o.device_type, o.serial_number,
+    o.work_order_id, o.`type`, o.title, o.content, o.fault_time, o.device_type, o.serial_number, o.station_id,
    o.reason, o.disposal_method, o.`status`, o.del_flag, o.tenant_id, o.create_time, o.create_by, o.update_time,
    o.update_by, o.remark
  </sql>
@ -130,6 +131,9 @@
      <if test="serialNumber != null">
        serial_number,
      </if>
+      <if test="stationId != null">
+        station_id,
+      </if>
      <if test="reason != null">
        reason,
      </if>
@ -172,6 +176,9 @@
      <if test="serialNumber != null">
        #{serialNumber,jdbcType=VARCHAR},
      </if>
+      <if test="stationId != null">
+        #{stationId},
+      </if>
      <if test="reason != null">
        #{reason,jdbcType=VARCHAR},
      </if>
@ -224,6 +231,9 @@
      <if test="serialNumber != null">
        serial_number = #{serialNumber,jdbcType=VARCHAR},
      </if>
+      <if test="stationId != null">
+        station_id = #{stationId},
+      </if>
      <if test="reason != null">
        reason = #{reason,jdbcType=VARCHAR},
      </if>
@ -254,6 +264,7 @@
        fault_time = #{faultTime, jdbcType=TIMESTAMP},
      device_type = #{deviceType,jdbcType=VARCHAR},
      serial_number = #{serialNumber,jdbcType=VARCHAR},
+        station_id=#{stationId},
      reason = #{reason,jdbcType=VARCHAR},
      disposal_method = #{disposalMethod,jdbcType=VARCHAR},
      `status` = #{status,jdbcType=SMALLINT},
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml
@ -7,6 +7,10 @@
    <result column="sort" jdbcType="SMALLINT" property="sort" />
    <result column="parent_type_id" jdbcType="INTEGER" property="parentTypeId" />
    <result column="status" jdbcType="SMALLINT" property="status" />
+    <result column="auto_send" property="autoSend" />
+    <result column="user_id" property="userId" />
+    <result column="auto_run" property="autoRun" />
+    <result column="measure" property="measure" />
    <result column="del_flag" jdbcType="SMALLINT" property="delFlag" />
    <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@ -15,7 +19,7 @@
    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
  </resultMap>
  <sql id="Base_Column_List">
-    work_type_id, name, sort, parent_type_id, `status`, del_flag, tenant_id,
+    work_type_id, name, sort, parent_type_id, `status`, del_flag, tenant_id, auto_send, user_id, auto_run, measure,
    create_time, create_by, update_time, update_by
  </sql>

@ -63,7 +67,7 @@


  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
+    select
    <include refid="Base_Column_List" />
    from xhpc_work_type_dict
    where work_type_id = #{workTypeId,jdbcType=INTEGER}
@ -91,11 +95,11 @@
  </update>
  <insert id="insert" keyColumn="work_type_id" keyProperty="workTypeId" parameterType="com.xhpc.activity.domain.XhpcWorkTypeDictDomain" useGeneratedKeys="true">
    insert into xhpc_work_type_dict (name, sort,
-      parent_type_id, `status`, del_flag,
-      tenant_id, create_time, create_by, 
+      parent_type_id, `status`, del_flag, auto_send, user_id, auto_run, measure,
+      tenant_id, create_time, create_by,
      update_time, update_by)
    values (#{name,jdbcType=VARCHAR}, #{sort,jdbcType=SMALLINT},
-      #{parentTypeId,jdbcType=INTEGER}, #{status,jdbcType=SMALLINT}, 0,
+      #{parentTypeId,jdbcType=INTEGER}, #{status,jdbcType=SMALLINT}, 0, #{autoSend}, #{userId}, #{autoRun}, #{measure},
      #{tenantId,jdbcType=VARCHAR}, SYSDATE(), #{createBy,jdbcType=VARCHAR},
      SYSDATE(), #{updateBy,jdbcType=VARCHAR})
  </insert>
@ -115,6 +119,18 @@
        `status`,
      </if>
        del_flag,
+      <if test="autoSend != null">
+        `auto_send`,
+      </if>
+      <if test="userId != null">
+        `user_id`,
+      </if>
+      <if test="autoRun != null">
+        `auto_run`,
+      </if>
+      <if test="measure != null">
+        `measure`,
+      </if>
      <if test="tenantId != null">
        tenant_id,
      </if>
@ -141,6 +157,18 @@
        #{status,jdbcType=SMALLINT},
      </if>
      0,
+      <if test="autoSend != null">
+        #{autoSend},
+      </if>
+      <if test="userId != null">
+        #{userId},
+      </if>
+      <if test="autoRun != null">
+        #{autoRun},
+      </if>
+      <if test="measure != null">
+        #{measure},
+      </if>
      <if test="tenantId != null">
        #{tenantId,jdbcType=VARCHAR},
      </if>
@ -166,6 +194,18 @@
      <if test="parentTypeId != null">
        parent_type_id = #{parentTypeId,jdbcType=INTEGER},
      </if>
+      <if test="autoSend != null">
+        `auto_send` =#{autoSend},
+      </if>
+      <if test="userId != null">
+        `user_id`=#{userId},
+      </if>
+      <if test="autoRun != null">
+        `auto_run`=#{autoRun},
+      </if>
+      <if test="measure != null">
+        `measure`=#{measure},
+      </if>
      <if test="status != null">
        `status` = #{status,jdbcType=SMALLINT},
      </if>
@ -184,6 +224,10 @@
    set name = #{name,jdbcType=VARCHAR},
      sort = #{sort,jdbcType=SMALLINT},
      parent_type_id = #{parentTypeId,jdbcType=INTEGER},
+        `auto_send` =#{autoSend},
+        `user_id`=#{userId},
+        `auto_run`=#{autoRun},
+        `measure`=#{measure},
      `status` = #{status,jdbcType=SMALLINT},
      tenant_id = #{tenantId,jdbcType=VARCHAR},
      update_time = SYSDATE(),
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml
@ -11,14 +11,18 @@
    <result column="wechat_openid" jdbcType="VARCHAR" property="wechatOpenid" />
    <result column="is_leader" jdbcType="SMALLINT" property="isLeader" />
    <result column="status" jdbcType="SMALLINT" property="status" />
+    <result column="type" property="type" />
+    <result column="operator_ids" property="operatorIds" />
+    <result column="station_ids" property="stationIds" />
    <result column="del_flag" jdbcType="SMALLINT" property="delFlag" />
    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
  </resultMap>
+
  <sql id="Base_Column_List">
-    u.work_user_id, u.user_name, u.dept_id, u.post_name, u.phone, u.email, u.wechat_openid, u.is_leader,
+    u.work_user_id, u.user_name, u.dept_id, u.post_name, u.phone, u.email, u.wechat_openid, u.is_leader, u.type, u.operator_ids, u.station_ids,
    u.`status`, u.del_flag, u.create_time, u.create_by, u.update_time, u.update_by
  </sql>

@ -53,7 +57,7 @@

  <select id="selectByPrimaryKey" parameterType="java.lang.Long"
          resultType="com.xhpc.activity.domain.XhpcWorkUserDomain">
-    select 
+    select
    <include refid="Base_Column_List" />, su.user_name as 'login_name', GROUP_CONCAT(r.role_id) as 'role_id', "123456" as 'login_password'
    from xhpc_work_user u
    left join sys_user su on su.phonenumber = u.phone
@ -69,13 +73,13 @@


  <insert id="insert" keyColumn="work_user_id" keyProperty="workUserId" parameterType="com.xhpc.activity.domain.XhpcWorkUserDomain" useGeneratedKeys="true">
-    insert into xhpc_work_user (user_name, dept_id, post_name, 
-      phone, email, wechat_openid, 
-      is_leader, `status`, del_flag, 
-      create_time, create_by, update_time, 
+    insert into xhpc_work_user (user_name, dept_id, post_name,
+      phone, email, wechat_openid, type, operator_ids, station_ids,
+      is_leader, `status`, del_flag,
+      create_time, create_by, update_time,
      update_by)
-    values (#{userName,jdbcType=VARCHAR}, #{deptId,jdbcType=BIGINT}, #{postName,jdbcType=VARCHAR}, 
-      #{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{wechatOpenid,jdbcType=VARCHAR}, 
+    values (#{userName,jdbcType=VARCHAR}, #{deptId,jdbcType=BIGINT}, #{postName,jdbcType=VARCHAR},
+      #{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{wechatOpenid,jdbcType=VARCHAR}, #{type}, #{operatorIds}, #{stationIds},
      #{isLeader,jdbcType=SMALLINT}, #{status,jdbcType=SMALLINT}, 0,
      sysdate(), #{createBy,jdbcType=VARCHAR}, sysdate(),
      #{updateBy,jdbcType=VARCHAR})
@ -90,6 +94,9 @@
      phone = #{phone,jdbcType=VARCHAR},
      email = #{email,jdbcType=VARCHAR},
      wechat_openid = #{wechatOpenid,jdbcType=VARCHAR},
+        type = #{type},
+        operator_ids=#{operatorIds},
+        station_ids=#{stationIds},
      is_leader = #{isLeader,jdbcType=SMALLINT},
      `status` = #{status,jdbcType=SMALLINT},
      update_time = sysdate(),