1 液化石油气监管-液化气用户模块功能开发。

zh-baseversion-admin/src/main/java/com/zehong/web/controller/lpgRegulation/TYehuaqiuserSafetyDeviceInfoController.java

@@ -105,4 +105,13 @@ public class TYehuaqiuserSafetyDeviceInfoController extends BaseController
     {
         return toAjax(tYehuaqiuserSafetyDeviceInfoService.deleteTYehuaqiuserSafetyDeviceInfoByIds(fSafetyDeviceIds));
     }
+
+    /**
+     * 删除液化石油气监管-液化气用户-安全装置加装维护-单个删除
+     */
+    @Log(title = "液化石油气监管-液化气用户-安全装置加装维护", businessType = BusinessType.DELETE)
+    @DeleteMapping("/deleteTYehuaqiuserSafetyDeviceInfoById/{fSafetyDeviceId}")
+    public AjaxResult deleteTYehuaqiuserSafetyDeviceInfoById(@PathVariable Long fSafetyDeviceId) {
+        return toAjax(tYehuaqiuserSafetyDeviceInfoService.deleteTYehuaqiuserSafetyDeviceInfoById(fSafetyDeviceId));
+    }
 }

zh-baseversion-system/src/main/java/com/zehong/system/domain/TYehuaqiUser.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import com.zehong.system.domain.vo.UserManageSafetyDeviceExportVo;
+import com.zehong.system.domain.vo.YeHuaqiUserManageSafetyDeviceExportVo;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zehong.common.annotation.Excel;
@@ -22,6 +23,12 @@ public class TYehuaqiUser extends BaseEntity
     /** 用户id */
     private Long userId;
 
+    /**
+     * 用户自有id - 新版本导入时使用，别的地方不用
+     */
+    private String userOwnId;
+
+
     /** 用户账号 */
     @Excel(name = "用户账号")
     private String username;
@@ -31,8 +38,14 @@ public class TYehuaqiUser extends BaseEntity
     private String nickName;
 
     /** 权属单位id */
-    @Excel(name = "权属单位id")
-    private Long beyondEnterpriseId;
+    //@Excel(name = "权属单位id")
+    private String beyondEnterpriseId;
+
+    /**
+     * 所属企业名称
+     */
+    @Excel(name = "所属企业")
+    private String beyondEnterpriseName;
 
     /** 用户类型 */
     @Excel(name = "用户类型")
@@ -86,21 +99,17 @@ public class TYehuaqiUser extends BaseEntity
 
     private String errorMsg;
 
-    /**
-     * 所属企业名称
-     */
-    private String beyondEnterpriseName;
 
     /**
      * 安全装置集合 导出时使用
      */
-    private List<UserManageSafetyDeviceExportVo> userManageSafetyDeviceExportVos;
+    private List<YeHuaqiUserManageSafetyDeviceExportVo> userManageSafetyDeviceExportVos;
 
-    public List<UserManageSafetyDeviceExportVo> getUserManageSafetyDeviceExportVos() {
+    public List<YeHuaqiUserManageSafetyDeviceExportVo> getUserManageSafetyDeviceExportVos() {
         return userManageSafetyDeviceExportVos;
     }
 
-    public void setUserManageSafetyDeviceExportVos(List<UserManageSafetyDeviceExportVo> userManageSafetyDeviceExportVos) {
+    public void setUserManageSafetyDeviceExportVos(List<YeHuaqiUserManageSafetyDeviceExportVo> userManageSafetyDeviceExportVos) {
         this.userManageSafetyDeviceExportVos = userManageSafetyDeviceExportVos;
     }
 
@@ -163,12 +172,12 @@ public class TYehuaqiUser extends BaseEntity
     {
         return nickName;
     }
-    public void setBeyondEnterpriseId(Long beyondEnterpriseId) 
+    public void setBeyondEnterpriseId(String beyondEnterpriseId)
     {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 
-    public Long getBeyondEnterpriseId() 
+    public String getBeyondEnterpriseId()
     {
         return beyondEnterpriseId;
     }
@@ -270,6 +279,14 @@ public class TYehuaqiUser extends BaseEntity
         this.villageName = villageName;
     }
 
+    public String getUserOwnId() {
+        return userOwnId;
+    }
+
+    public void setUserOwnId(String userOwnId) {
+        this.userOwnId = userOwnId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/UserManageGasUserExportVo.java

@@ -19,8 +19,8 @@ public class UserManageGasUserExportVo {
     @Excel(name = "燃气类型(0-天然气;1-液化气)")
     private String gasType;
 
-    /** 用户类型（1居民用户，2商业用户，3工业用户） */
-    @Excel(name = "用户类型(1-居民用户;2-商业用户;3-工业用户;4-餐饮单位用户)")
+    /** 用户类型（1-居民用户;2-工商业用户;4-餐饮单位用户） */
+    @Excel(name = "用户类型(1-居民用户;2-工商业用户;4-餐饮单位用户)")
     private String userType;
 
     /**

zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/YeHuaqiUserManageSafetyDeviceExportVo.java

+package com.zehong.system.domain.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+
+public class YeHuaqiUserManageSafetyDeviceExportVo {
+
+    /** 用户账号 */
+    @Excel(name = "用户自有编号")
+    private String userOwnId;
+
+    /** 关联设备类型 */
+    @Excel(name = "设备类型")
+    private String fRelationDeviceType;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String fDeviceName;
+
+    /** 设备型号 */
+    @Excel(name = "设备型号")
+    private String fDeviceModel;
+
+    /** 物联网编号 */
+    @Excel(name = "物联网编号")
+    private String fIotNo;
+
+    /** 探测介质 */
+    @Excel(name = "探测介质")
+    private String fDetectionMedium;
+
+    /** 设备安装时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "设备安装时间(yyyy-mm-dd)",width = 30,format ="yyyy-MM-dd")
+    private Date fDeviceInstallTime;
+
+    private String fDeviceInstallTimeStr;
+
+    /** 安装位置 */
+    @Excel(name = "安装位置")
+    private String fDeviceInstallPosition;
+
+    /** 负责人 */
+    @Excel(name = "负责人")
+    private String fHead;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String fPhone;
+
+    public String getUserOwnId() {
+        return userOwnId;
+    }
+
+    public void setUserOwnId(String userOwnId) {
+        this.userOwnId = userOwnId;
+    }
+
+    public String getfRelationDeviceType() {
+        return fRelationDeviceType;
+    }
+
+    public void setfRelationDeviceType(String fRelationDeviceType) {
+        this.fRelationDeviceType = fRelationDeviceType;
+    }
+
+    public String getfDeviceName() {
+        return fDeviceName;
+    }
+
+    public void setfDeviceName(String fDeviceName) {
+        this.fDeviceName = fDeviceName;
+    }
+
+    public String getfDeviceModel() {
+        return fDeviceModel;
+    }
+
+    public void setfDeviceModel(String fDeviceModel) {
+        this.fDeviceModel = fDeviceModel;
+    }
+
+    public String getfIotNo() {
+        return fIotNo;
+    }
+
+    public void setfIotNo(String fIotNo) {
+        this.fIotNo = fIotNo;
+    }
+
+    public String getfDetectionMedium() {
+        return fDetectionMedium;
+    }
+
+    public void setfDetectionMedium(String fDetectionMedium) {
+        this.fDetectionMedium = fDetectionMedium;
+    }
+
+    public Date getfDeviceInstallTime() {
+        return fDeviceInstallTime;
+    }
+
+    public void setfDeviceInstallTime(Date fDeviceInstallTime) {
+        this.fDeviceInstallTime = fDeviceInstallTime;
+    }
+
+    public String getfDeviceInstallTimeStr() {
+        return fDeviceInstallTimeStr;
+    }
+
+    public void setfDeviceInstallTimeStr(String fDeviceInstallTimeStr) {
+        this.fDeviceInstallTimeStr = fDeviceInstallTimeStr;
+    }
+
+    public String getfDeviceInstallPosition() {
+        return fDeviceInstallPosition;
+    }
+
+    public void setfDeviceInstallPosition(String fDeviceInstallPosition) {
+        this.fDeviceInstallPosition = fDeviceInstallPosition;
+    }
+
+    public String getfHead() {
+        return fHead;
+    }
+
+    public void setfHead(String fHead) {
+        this.fHead = fHead;
+    }
+
+    public String getfPhone() {
+        return fPhone;
+    }
+
+    public void setfPhone(String fPhone) {
+        this.fPhone = fPhone;
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TYehuaqiUserMapper.java

@@ -49,6 +49,22 @@ public interface TYehuaqiUserMapper
      */
     public int insertTYehuaqiUser(TYehuaqiUser tYehuaqiUser);
 
+    /**
+     * 批量增加
+     * @param list list
+     * @return r
+     */
+    public int insertBatch(@Param("list") List<TYehuaqiUser> list);
+
+    /**
+     * 查询燃气用户列表 - 导出使用
+     *
+     * @param tDetectorUser 燃气用户
+     * @return 燃气用户集合
+     */
+    public List<TYehuaqiUser> selectForExportTYehuaqiUserList(TYehuaqiUser tDetectorUser);
+
+    public List<TYehuaqiUser> queryErrorDetectorUserList(String depId);
     /**
      * 修改燃气用户
      * 

zh-baseversion-system/src/main/java/com/zehong/system/service/ITYehuaqiUserService.java

@@ -4,9 +4,7 @@ import java.util.List;
 
 import com.zehong.system.domain.TDetectorUser;
 import com.zehong.system.domain.TYehuaqiUser;
-import com.zehong.system.domain.vo.GasUserAndSafetyDeviceVo;
-import com.zehong.system.domain.vo.TDetectorUserVO;
-import com.zehong.system.domain.vo.TYehuaqiUserVO;
+import com.zehong.system.domain.vo.*;
 
 /**
  * 燃气用户Service接口
@@ -39,6 +37,32 @@ public interface ITYehuaqiUserService
      * @return r
      */
     public int countByBeyondEnterpriseId();
+
+
+    /**
+     * 处理 解析好的 多sheet 导入的数据
+     * @param gasUserExportVos g
+     * @param safetyDeviceExportVos s
+     */
+    public void handleCustomMoreSheetImportData(List<UserManageGasUserExportVo> gasUserExportVos,
+                                                List<YeHuaqiUserManageSafetyDeviceExportVo> safetyDeviceExportVos,
+                                                boolean updateSupport ,boolean reImportOfIncorrectDataFlag) ;
+
+
+    /**
+     * 查询燃气用户列表 - 导出使用
+     *
+     * @param tDetectorUser 燃气用户
+     * @return 燃气用户集合
+     */
+    public List<TYehuaqiUser> selectForExportTYehuaqiUserList(TYehuaqiUser tDetectorUser);
+
+    /**
+     * 查询导入的错误数据
+     * @return r
+     */
+    public List<TYehuaqiUser> queryErrorDetectorUserList();
+
     /**
      * 新增燃气用户
      * 

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TYehuaqiuserSafetyDeviceInfoServiceImpl.java

@@ -33,7 +33,7 @@ public class TYehuaqiuserSafetyDeviceInfoServiceImpl implements ITYehuaqiuserSaf
 
     @Override
     public List<TYehuaqiuserSafetyDeviceInfo> queryDeviceInfoByUserId(Long userId) {
-        return null;
+        return tYehuaqiuserSafetyDeviceInfoMapper.queryDeviceInfoByUserId(userId);
     }
 
     /**

zh-baseversion-system/src/main/resources/mapper/system/TYehuaqiUserMapper.xml

@@ -22,9 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="deviceNum"    column="deviceNum"    />
         <result property="zxnum"    column="zxnum"    />
-        <result property="beyondEnterpriseName"    column="enterprise_name"    />
+        <result property="beyondEnterpriseName"    column="beyond_enterprise_name"    />
         <result property="villageId"    column="f_village_id"    />
-        <result property="villageName"    column="f_village_name"    />
+        <result property="villageName"    column="village_name"    />
         <result property="errorMsg"    column="error_msg"    />
     </resultMap>
 
@@ -46,25 +46,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="deviceNum"    column="deviceNum"    />
         <result property="zxnum"    column="zxnum"    />
-        <result property="beyondEnterpriseName"    column="enterprise_name"    />
+        <result property="beyondEnterpriseName"    column="beyond_enterprise_name"    />
         <result property="villageId"    column="f_village_id"    />
-        <result property="villageName"    column="f_village_name"    />
+        <result property="villageName"    column="village_name"    />
         <result property="errorMsg"    column="error_msg"    />
 
         <!-- collection 是用于建立一对多中集合属性的对应关系
         ofType 用于指定集合元素的数据类型
         -->
-        <collection property="userManageSafetyDeviceExportVos" ofType="UserManageSafetyDeviceExportVo">
+        <collection property="userManageSafetyDeviceExportVos" ofType="YeHuaqiUserManageSafetyDeviceExportVo">
             <id property="userOwnId" column="user_id"/>
-            <result property="relationDeviceType" column="f_relation_device_type"/>
-            <result property="deviceName" column="f_device_name"/>
-            <result property="deviceModel" column="f_device_model"/>
+            <result property="fRelationDeviceType" column="f_relation_device_type"/>
+            <result property="fDeviceName" column="f_device_name"/>
+            <result property="fDeviceModel" column="f_device_model"/>
             <result property="fIotNo" column="f_iot_no"/>
-            <result property="detectionMedium" column="f_detection_medium"/>
-            <result property="deviceInstallTime" column="f_device_install_time"/>
-            <result property="deviceInstallPosition" column="f_device_install_position"/>
-            <result property="head" column="f_head"/>
-            <result property="phone" column="f_phone"/>
+            <result property="fDetectionMedium" column="f_detection_medium"/>
+            <result property="fDeviceInstallTime" column="f_device_install_time"/>
+            <result property="fDeviceInstallPosition" column="f_device_install_position"/>
+            <result property="fHead" column="f_head"/>
+            <result property="fPhone" column="f_phone"/>
         </collection>
 
     </resultMap>
@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '工商业用户' WHEN '4' THEN '餐饮单位用户'end) as   user_type ,
         '液化气' as gas_type ,
         a.address, a.longitude, a.latitude, a.linkman, a.phone, a.email, a.create_time, a.update_time, a.is_del, a.remarks,
-        b.enterprise_name,a.f_village_id,v.f_village_name
+        b.enterprise_name as beyond_enterprise_name,a.f_village_id,v.f_village_name as village_name
         from t_yehuaqi_user a left join t_enterprise_info b on a.beyond_enterprise_id=b.enterprise_id
         left join t_user_manage_village v on a.f_village_id=v.f_village_id
         <where> a.is_del = '0' and a.error_msg is null
@@ -120,7 +120,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTYehuaqiUserVo"/>
         where user_id = #{userId}
     </select>
-        
+
+    <select id="queryErrorDetectorUserList" parameterType="string" resultMap="TYehuaqiUserResult">
+        select * from t_yehuaqi_user where error_msg is not null
+        <if test="depId != null and depId != '' and depId != '-2'">
+            and beyondEnterpriseId = #{depId}
+        </if>
+    </select>
+
+    <select id="selectForExportTYehuaqiUserList" parameterType="TYehuaqiUser" resultMap="TYehuaqiUserExportResult">
+
+        select a.user_id,
+        a.username,
+        a.nick_name,
+        (CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '工商业用户' WHEN '4' THEN '餐饮单位用户'end) as   user_type ,
+        a.address, a.longitude, a.latitude, a.linkman, a.phone, a.email, a.create_time, a.update_time, a.is_del, a.remarks,
+        b.enterprise_name as beyond_enterprise_name,a.f_village_id,v.f_village_name as village_name,
+        deviceInfo.f_relation_device_type,
+        deviceInfo.f_device_name,
+        deviceInfo.f_device_model,
+        deviceInfo.f_iot_no,
+        deviceInfo.f_detection_medium,
+        deviceInfo.f_device_install_time,
+        deviceInfo.f_device_install_position,
+        deviceInfo.f_head,
+        deviceInfo.f_phone
+        from t_yehuaqi_user a left join t_enterprise_info b on a.beyond_enterprise_id=b.enterprise_id
+        left join t_user_manage_village v on a.f_village_id=v.f_village_id
+        left join t_yehuaqiuser_safety_device_info deviceInfo on a.user_id = deviceInfo.f_relation_user_id
+        <where> a.is_del = '0' and a.error_msg is null
+            <if test="beyondEnterpriseId != null  and beyondEnterpriseId != -2"> and a.beyond_enterprise_id =#{beyondEnterpriseId}</if>
+            <if test="username != null  and username != ''"> and a.username like concat('%', #{username}, '%')</if>
+            <if test="nickName != null  and nickName != ''"> and (a.nick_name like concat('%', #{nickName}, '%') or a.username like concat('%', #{nickName}, '%'))</if>
+        </where>
+        order by a.user_id desc
+    </select>
+
+    <insert id="insertBatch" parameterType="list" useGeneratedKeys="true" keyProperty="userId">
+
+        insert into t_yehuaqi_user (nick_name, beyond_enterprise_name,beyond_enterprise_id, user_type, village_name,f_village_id,
+        address, linkman, phone, remarks, error_msg)
+        values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.nickName,jdbcType=VARCHAR}, #{item.beyondEnterpriseName,jdbcType=VARCHAR}, #{item.beyondEnterpriseId,jdbcType=VARCHAR},
+            #{item.userType,jdbcType=VARCHAR}, #{item.villageName,jdbcType=VARCHAR},
+            #{item.villageId,jdbcType=DECIMAL},
+            #{item.address,jdbcType=VARCHAR}, #{item.linkman,jdbcType=VARCHAR}, #{item.phone,jdbcType=VARCHAR},
+            #{item.remarks,jdbcType=VARCHAR}, #{item.errorMsg,jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
     <insert id="insertTYehuaqiUser" parameterType="TYehuaqiUser" useGeneratedKeys="true" keyProperty="userId">
         insert into t_yehuaqi_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -138,6 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="isDel != null">is_del,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="villageId != null">f_village_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="username != null">#{username},</if>
@@ -154,6 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="villageId != null">#{villageId},</if>
          </trim>
     </insert>
 
@@ -174,6 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="villageId != null">f_village_id = #{villageId},</if>
         </trim>
         where user_id = #{userId}
     </update>

zh-baseversion-system/src/main/resources/mapper/system/TYehuaqiuserSafetyDeviceInfoMapper.xml

@@ -45,9 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where f_safety_device_id = #{fSafetyDeviceId}
     </select>
     <select id="queryDeviceInfoByUserId" parameterType="Long" resultMap="TYehuaqiuserSafetyDeviceInfoResult">
-
         <include refid="selectTYehuaqiuserSafetyDeviceInfoVo"/>
-        where fRelationUserId = #{userId}
+        where f_relation_user_id = #{userId}
     </select>
         
     <insert id="insertTYehuaqiuserSafetyDeviceInfo" parameterType="TYehuaqiuserSafetyDeviceInfo" useGeneratedKeys="true" keyProperty="fSafetyDeviceId">

zh-baseversion-web/src/api/lpgRegulation/user.js

@@ -96,9 +96,8 @@ export function deleteSafetyDeviceListInfo(data) {
 // 删除关联设备信息
 export function deleteSafetyDeviceInfo(deviceId) {
   return request({
-    url: '/gasUserSafetyDevice/info/deleteSafetyDeviceInfo',
-    method: 'delete',
-    data:deviceId
+    url: '/yehuaqiUserSafetyDeviceInfo/info/deleteTYehuaqiuserSafetyDeviceInfoById/' + deviceId,
+    method: 'delete'
   })
 }