1 基础信息维护-用户管理-燃气用户，拷贝 基础信息维护-燃气用户界面，并做相应调整

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TDetectorUserController.java

@@ -132,11 +132,29 @@ public class TDetectorUserController extends BaseController
         //获取用户信息
         SysUser user = SecurityUtils.getLoginUser().getUser();
         tDetectorUser.setBeyondEnterpriseId(user.getDeptId());
+        //老的导出把居住区隐藏
+        ExcelUtil.hiddencolumns.add(10);
         List<TDetectorUser> list = tDetectorUserService.selectTDetectorUserList(tDetectorUser);
         ExcelUtil<TDetectorUser> util = new ExcelUtil<TDetectorUser>(TDetectorUser.class);
-        return util.exportExcel(list, "燃气用户数据");
+        AjaxResult ajaxResult = util.exportExcel(list, "燃气用户数据");
+        ExcelUtil.hiddencolumns.clear();
+        return ajaxResult;
     }
 
+    /**
+     * 导出燃气用户列表-new 有居住区的导出
+     */
+    @Log(title = "燃气用户", businessType = BusinessType.EXPORT)
+    @GetMapping("/newExport")
+    public AjaxResult newExport(TDetectorUser tDetectorUser)
+    {
+        //获取用户信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        tDetectorUser.setBeyondEnterpriseId(user.getDeptId());
+        List<TDetectorUser> list = tDetectorUserService.newSelectTDetectorUserList(tDetectorUser);
+        ExcelUtil<TDetectorUser> util = new ExcelUtil<TDetectorUser>(TDetectorUser.class);
+        return util.exportExcel(list, "燃气用户数据");
+    }
     /**
      * 获取燃气用户详细信息
      */

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TUserManageVillageController.java

@@ -44,6 +44,17 @@ public class TUserManageVillageController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询基本信息维护-用户管理-居住区(村庄)列表-无分页
+     */
+    @GetMapping("/noPagelist")
+    public List<TUserManageVillage> noPagelist(TUserManageVillage tUserManageVillage)
+    {
+        return tUserManageVillageService.selectTUserManageVillageList(tUserManageVillage);
+    }
+
+
+
     /**
      * 导出基本信息维护-用户管理-居住区(村庄)列表
      */

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

@@ -101,6 +101,17 @@ public class TDetectorUser extends BaseEntity
      */
     private Long taskId;
 
+    /**
+     * 居住区村庄id
+     */
+    private Long villageId;
+
+    /**
+     * 居住区村庄名称
+     */
+    @Excel(name = "居住区(村、庄)")
+    private String villageName;
+
     private List<Long> hasInspectUser;
 
 
@@ -289,6 +300,22 @@ public class TDetectorUser extends BaseEntity
         this.gasType = gasType;
     }
 
+    public Long getVillageId() {
+        return villageId;
+    }
+
+    public void setVillageId(Long villageId) {
+        this.villageId = villageId;
+    }
+
+    public String getVillageName() {
+        return villageName;
+    }
+
+    public void setVillageName(String villageName) {
+        this.villageName = villageName;
+    }
+
     @Override
     public String toString() {
         return "TDetectorUser{" +

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

@@ -61,6 +61,15 @@ public interface TDetectorUserMapper
      * @return 燃气用户集合
      */
     public List<TDetectorUser> selectTDetectorUserList(TDetectorUser tDetectorUser);
+
+    /**
+     * 查询燃气用户列表-new 有 居住区了
+     *
+     * @param tDetectorUser 燃气用户
+     * @return 燃气用户集合
+     */
+    public List<TDetectorUser> newSelectTDetectorUserList(TDetectorUser tDetectorUser);
+
     public List<TDetectorUser> selectTDetectorListstatus(TDetectorUser tDetectorUser);
 
     /**

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

@@ -85,6 +85,14 @@ public interface ITDetectorUserService
      * @return 燃气用户集合
      */
     public List<TDetectorUser> selectTDetectorUserList(TDetectorUser tDetectorUser);
+
+    /**
+     * 查询燃气用户列表
+     *
+     * @param tDetectorUser 燃气用户
+     * @return 燃气用户集合
+     */
+    public List<TDetectorUser> newSelectTDetectorUserList(TDetectorUser tDetectorUser);
     public List<TDetectorUser> selectTDetectorListstatus(TDetectorUser tDetectorUser);
 
     /**

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

@@ -262,6 +262,18 @@ public class TDetectorUserServiceImpl implements ITDetectorUserService
     {
         return tDetectorUserMapper.selectTDetectorUserList(tDetectorUser);
     }
+
+    /**
+     * 查询燃气用户列表-new
+     *
+     * @param tDetectorUser 燃气用户
+     * @return 燃气用户
+     */
+    @Override
+    public List<TDetectorUser> newSelectTDetectorUserList(TDetectorUser tDetectorUser) {
+        return tDetectorUserMapper.newSelectTDetectorUserList(tDetectorUser);
+    }
+
     @Override
     public List<TDetectorUser> selectTDetectorListstatus(TDetectorUser tDetectorUser){
         return tDetectorUserMapper.selectTDetectorListstatus(tDetectorUser);

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

@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isDel"    column="is_del"    />
         <result property="remarks"    column="remarks"    />
         <result property="beyondEnterpriseName"    column="enterprise_name"    />
+        <result property="villageId"    column="f_village_id"    />
+        <result property="villageName"    column="f_village_name"    />
     </resultMap>
 
     <resultMap type="TDetectorUserInspectVo" id="TDetectorUserInspectResult">
@@ -40,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTDetectorUserVo">
-        select user_id, username, nick_name, user_type, gas_type,address, longitude, latitude, linkman, phone, email, create_time, update_time, is_del, remarks from t_detector_user
+        select user_id, username, nick_name, user_type, gas_type,address, longitude, latitude, linkman, phone, email, create_time, update_time, is_del, remarks,f_village_id from t_detector_user
     </sql>
 
     <select id="selectTDetectorUserList" parameterType="TDetectorUser" resultMap="TDetectorUserResult">
@@ -50,8 +52,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '商业用户'WHEN '3' THEN '工业用户'WHEN '4' THEN '餐饮单位用户'end) as   user_type ,
         (CASE a.gas_type WHEN '0' THEN '天然气' WHEN '1' THEN '液化气' end) 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
+        b.enterprise_name,a.f_village_id,v.f_village_name
+        from t_detector_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'
+            <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>
+            <if test="isInspect != null  and isInspect == 0">
+                and a.user_id not in
+                <foreach item="hasInspectUser" collection="hasInspectUser" open="(" separator="," close=")">
+                    #{hasInspectUser}
+                </foreach>
+            </if>
+            <if test="isInspect != null and isInspect == 1">
+                and a.user_id in
+                <foreach item="hasInspectUser" collection="hasInspectUser" open="(" separator="," close=")">
+                    #{hasInspectUser}
+                </foreach>
+            </if>
+        </where>
+        order by a.user_id desc
+    </select>
+
+    <select id="newSelectTDetectorUserList" parameterType="TDetectorUser" resultMap="TDetectorUserResult">
+        select a.user_id,
+               a.username,
+               a.nick_name,
+               (CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '商业用户'WHEN '3' THEN '工业用户'WHEN '4' THEN '餐饮单位用户'end) as   user_type ,
+               (CASE a.gas_type WHEN '0' THEN '天然气' WHEN '1' THEN '液化气' end) 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
         from t_detector_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'
             <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>
@@ -71,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by a.user_id desc
     </select>
+
+
     <select id="selectTDetectorListstatus" parameterType="TDetectorUser" resultMap="TDetectorUserResult">
         SELECT a.user_id, a.username, a.nick_name , a.address,
         a.longitude, a.latitude, a.linkman, a.phone, a.email, a.create_time,
@@ -107,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTDetectorUserById" parameterType="Long" resultMap="TDetectorUserResult">
        select a.user_id, a.beyond_enterprise_id,a.username, a.nick_name, a.user_type,a.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.linkman, a.phone, a.email, a.create_time, a.update_time, a.is_del, a.remarks, b.enterprise_name,a.f_village_id
         from t_detector_user a left join t_enterprise_info b on a.beyond_enterprise_id=b.enterprise_id
         where a.user_id = #{userId}
     </select>
@@ -201,6 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="email != null">email,</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>
@@ -216,6 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="email != null">#{email},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="villageId != null">#{villageId},</if>
          </trim>
     </insert>
 
@@ -237,6 +274,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-web/src/api/regulation/user.js

@@ -51,3 +51,13 @@ export function exportUser(query) {
     params: query
   })
 }
+
+
+// 导出燃气用户-新的-有居住区的导出
+export function newExportUser(query) {
+  return request({
+    url: '/supervise/user/newExport',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

zh-baseversion-web/src/api/regulation/userManagement/village.js

@@ -51,3 +51,13 @@ export function exportVillage(query) {
     params: query
   })
 }
+
+
+// 查询基本信息维护-用户管理-居住区(村庄)列表-无分页
+export function noPageListVillage(query) {
+  return request({
+    url: '/system/village/noPagelist',
+    method: 'get',
+    params: query
+  })
+}

zh-baseversion-web/vue.config.js

@@ -34,9 +34,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8905/gassafety`,
+        target: `http://localhost:8905/gassafety`,
         // target: `http://27.128.233.145:8905/gassafety`,
-        target: `http://36.138.180.82:8905/gassafety`,
+        // target: `http://36.138.180.82:8905/gassafety`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",