1

data-ui/src/api/data/digitalresources/level.js

@@ -10,9 +10,9 @@ export function listLevel(query) {
 }
 
 // 查询level详细
-export function getLevel(id) {
+export function getLevel(id,type) {
   return request({
-    url: '/sooka-sponest-center-data/level/' + id,
+    url: '/sooka-sponest-center-data/level/' + id + '/' + type,
     method: 'get'
   })
 }

data-ui/src/views/data/digitaltraffic/level/IForm.vue

@@ -170,8 +170,8 @@
         this.title = a + b;
         this.getCenterMonitorlList();
         this.$nextTick(() => {
-          if (id) {
-            getLevel(id).then(response => {
+          if (id,this.form.type) {
+            getLevel(id,this.form.type).then(response => {
               this.form = response.data;
               this.form.userList.length > 0 ? this.$refs.ITabs.init(this.form.userList) : []
             })

src/main/java/com/sooka/sponest/data/digitalforest/controller/CenterdataTForestLinleaderController.java

@@ -107,13 +107,13 @@ public class CenterdataTForestLinleaderController extends BaseController {
     @Log(title = "林长管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody CenterdataTForestLinleader centerdataTForestLinleader) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("type","1");
-        map.put("id",centerdataTForestLinleader.getId());
-        int num = centerdataTHydraulicRiverLengthService.selectPersonByUserId(map);
-        if (num>0){
-            return AjaxResult.error("当前人员已有下级资源");
-        }
+//        Map<String,Object> map = new HashMap<>();
+//        map.put("type","1");
+//        map.put("id",centerdataTForestLinleader.getId());
+//        int num = centerdataTHydraulicRiverLengthService.selectPersonByUserId(map);
+//        if (num>0){
+//            return AjaxResult.error("当前人员已有下级资源");
+//        }
         return toAjax(centerdataTForestLinleaderService.updateCenterdataTForestLinleader(centerdataTForestLinleader));
     }
 

src/main/java/com/sooka/sponest/data/digitaltraffic/controller/CenterdataTSupermapLevelController.java

@@ -64,9 +64,9 @@ public class CenterdataTSupermapLevelController extends BaseController {
 
     @ApiOperation(value = "获取level详细信息",notes = "获取level详细信息")
     @RequiresPermissions("traffic:level:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(centerdataTSupermapLevelService.selectCenterdataTSupermapLevelById(id));
+    @GetMapping(value = "/{id}/{type}")
+    public AjaxResult getInfo(@PathVariable("id") String id,@PathVariable("type") String type) {
+        return AjaxResult.success(centerdataTSupermapLevelService.selectCenterdataTSupermapLevelById(id,type));
     }
 
     /**

src/main/java/com/sooka/sponest/data/digitaltraffic/mapper/CenterdataTLevelPersonNMapper.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.digitaltraffic.mapper;
 
 import com.sooka.sponest.data.digitaltraffic.domain.CenterdataTLevelPersonN;
 import com.sooka.sponest.data.digitaltraffic.domain.CenterdataTSupermapLevel;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -14,7 +15,7 @@ public interface CenterdataTLevelPersonNMapper {
 
     int insertSelective(CenterdataTLevelPersonN record);
 
-    List<CenterdataTLevelPersonN> selectByPrimaryKey(String supermapLevelId);
+    List<CenterdataTLevelPersonN> selectByPrimaryKey(@Param("type") String type, @Param("supermapLevelId") String supermapLevelId);
 
     List<Map<String, Object>> selectAll(CenterdataTSupermapLevel centerdataTSupermapLevel);
 

src/main/java/com/sooka/sponest/data/digitaltraffic/service/ICenterdataTSupermapLevelService.java

@@ -29,7 +29,7 @@ public interface ICenterdataTSupermapLevelService extends IBaseService {
      * @param id level主键
      * @return level
      */
-    CenterdataTSupermapLevel selectCenterdataTSupermapLevelById(String id);
+    CenterdataTSupermapLevel selectCenterdataTSupermapLevelById(String id,String type);
 
     /**
      * 新增level

src/main/java/com/sooka/sponest/data/digitaltraffic/service/impl/CenterdataTSupermapLevelServiceImpl.java

@@ -59,10 +59,10 @@ public class CenterdataTSupermapLevelServiceImpl extends BaseServiceImpl impleme
      * @return level
      */
     @Override
-    public CenterdataTSupermapLevel selectCenterdataTSupermapLevelById(String id) {
+    public CenterdataTSupermapLevel selectCenterdataTSupermapLevelById(String id,String type) {
         CenterdataTSupermapLevel centerdataTSupermapLevel = centerdataTSupermapLevelMapper.selectCenterdataTSupermapLevelById(id);
         centerdataTSupermapLevel.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
-        centerdataTSupermapLevel.setUserList(centerdataTLevelPersonNMapper.selectByPrimaryKey(id));
+        centerdataTSupermapLevel.setUserList(centerdataTLevelPersonNMapper.selectByPrimaryKey(type,id));
         return centerdataTSupermapLevel;
     }
 
@@ -173,10 +173,13 @@ public class CenterdataTSupermapLevelServiceImpl extends BaseServiceImpl impleme
     public List<Map<String, Object>> getDeviceList(CenterdataTSupermapLevel centerdataTSupermapLevel) {
         setSookaDataBase(centerdataTSupermapLevel);
         List<Map<String, Object>> mapList = centerdataTSupermapLevelMapper.getDeviceList(centerdataTSupermapLevel);
-        List<Map<String, Object>> ns = centerdataTLevelPersonNMapper.selectAll(centerdataTSupermapLevel);
-        mapList.forEach(item -> {
-            item.put("userList", ns.stream().filter(o -> MapUtils.getString(o, "supermapLevelId").equals(MapUtils.getString(item, "superMapId"))).collect(Collectors.toList()));
-        });
+        if (mapList != null && mapList.size() != 0) {
+            centerdataTSupermapLevel.setType(mapList.get(0).get("type").toString());
+            List<Map<String, Object>> ns = centerdataTLevelPersonNMapper.selectAll(centerdataTSupermapLevel);
+            mapList.forEach(item -> {
+                item.put("userList", ns.stream().filter(o -> MapUtils.getString(o, "supermapLevelId").equals(MapUtils.getString(item, "superMapId"))).collect(Collectors.toList()));
+            });
+        }
         return mapList;
     }
 }

src/main/java/com/sooka/sponest/data/digitalwater/controller/CenterdataTHydraulicRiverLengthController.java

@@ -104,12 +104,12 @@ public class CenterdataTHydraulicRiverLengthController extends BaseController {
             @ApiImplicitParam(name = "id", value = "主键id", dataType = "String", required = true)
     })
     public AjaxResult getInfo(@PathVariable(value = "id") String id) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("id", id);
-        int num = centerdataTHydraulicRiverLengthService.selectPersonByUserId(map);
-        if (num > 0) {
-            return AjaxResult.error("当前人员已有下级资源");
-        }
+//        Map<String, Object> map = new HashMap<>();
+//        map.put("id", id);
+//        int num = centerdataTHydraulicRiverLengthService.selectPersonByUserId(map);
+//        if (num > 0) {
+//            return AjaxResult.error("当前人员已有下级资源");
+//        }
         //centerdata_t_hydraulic_river_hechang 河长牌
         int heChangNum = centerdataTHydraulicRiverLengthService.selectHeChangByHechangId(id);
         if (heChangNum > 0) {

src/main/resources/mapper/digitaltraffic/CenterdataTLevelPersonNMapper.xml

@@ -18,10 +18,6 @@
         <result column="dept_name" property="deptName"/>
     </resultMap>
 
-    <sql id="Base_Column_List">
-        id, type, person_phone, person_name, admini_strative_lin_job, lin_job, supermap_level_id, person_id, z_id, dept_id, dept_name
-    </sql>
-
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
         delete
         from centerdata_t_level_person_n
@@ -30,9 +26,9 @@
 
     <insert id="insert" parameterType="CenterdataTLevelPersonN">
         insert into centerdata_t_level_person_n (
-            `type`, person_phone, person_name, id, admini_strative_lin_job, lin_job, supermap_level_id, person_id, z_id, dept_id, dept_name)
+            `type`, id, supermap_level_id, person_id, z_id, dept_id, dept_name)
         values (
-            #{type}, #{personPhone}, #{personName}, #{id}, #{adminiStrativeLinJob}, #{linJob}, #{supermapLevelId}, #{personId}, #{zId}, #{deptId}, #{deptName})
+            #{type}, #{id}, #{supermapLevelId}, #{personId}, #{zId}, #{deptId}, #{deptName})
     </insert>
 
     <insert id="insertSelective" parameterType="CenterdataTLevelPersonN">
@@ -100,27 +96,50 @@
         </trim>
     </insert>
 
-    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List"/>
-        from centerdata_t_level_person_n
+            a.id, a.type,  a.supermap_level_id, a.person_id, a.z_id, a.dept_id, a.dept_name,
+        <choose>
+            <when test="type == 1">
+                b.lin_phone person_phone,b.lin_name person_name,b.lin_job lin_job,b.admini_strative_lin_job admini_strative_lin_job
+            </when>
+            <otherwise>b.phone person_phone,b.name person_name,b.post lin_job,b.admini_strative_lin_job admini_strative_lin_job</otherwise>
+        </choose>
+        from centerdata_t_level_person_n a
+        <choose>
+            <when test="type == 1">
+                left join centerdata_t_forest_linleader b on a.z_id = b.id
+            </when>
+            <otherwise>left join centerdata_t_hydraulic_river_length b on a.z_id = b.id</otherwise>
+        </choose>
         where supermap_level_id = #{supermapLevelId}
     </select>
 
     <select id="selectAll" resultType="map">
         select
-            a.admini_strative_lin_job job,
-            a.lin_job linJob,
             d.dict_label position,
-            a.person_name name,
-            a.person_phone phone,
             a.supermap_level_id supermapLevelId,
             a.person_id personId,
             a.z_id zId,
             a.dept_id deptId,
-            a.dept_name deptName
+            a.dept_name deptName,
+        <choose>
+            <when test="type == 1">
+                b.lin_phone phone,b.lin_name name,b.lin_job linJob,b.admini_strative_lin_job job
+            </when>
+            <otherwise>b.phone phone,b.name name,b.post linJob,b.admini_strative_lin_job job</otherwise>
+        </choose>
         from centerdata_t_level_person_n a
-        left join ${database_system}.sys_dict_data d on d.dict_value = a.lin_job
+        <choose>
+            <when test="type == 1">
+                left join centerdata_t_forest_linleader b on a.z_id = b.id
+                left join ${database_system}.sys_dict_data d on d.dict_value = b.lin_job
+            </when>
+            <otherwise>
+                    left join centerdata_t_hydraulic_river_length b on a.z_id = b.id
+                    left join ${database_system}.sys_dict_data d on d.dict_value = b.post
+            </otherwise>
+        </choose>
     </select>
 
     <update id="updateByPrimaryKeySelective" parameterType="CenterdataTLevelPersonN">
@@ -163,10 +182,6 @@
     <update id="updateByPrimaryKey" parameterType="CenterdataTLevelPersonN">
         update centerdata_t_level_person_n set
             `type` = #{type},
-            person_phone = #{personPhone},
-            person_name = #{personName},
-            admini_strative_lin_job = #{adminiStrativeLinJob},
-            lin_job = #{linJob},
             supermap_level_id = #{supermapLevelId},
             person_id = #{personId},
             z_id = #{zId},

src/main/resources/mapper/digitaltraffic/CenterdataTSupermapLevelMapper.xml

@@ -32,10 +32,33 @@
     <select id="selectCenterdataTSupermapLevelList" parameterType="CenterdataTSupermapLevel"
             resultMap="CenterdataTSupermapLevelResult">
         SELECT a.id, a.name, a.map_address,a.type, a.map_data, a.map_name, a.longitude, a.latitude, a.dept_id,
-        a.dept_name, a.create_by, a.create_time, a.create_name, a.update_by, a.update_time, a.update_name,
-        group_concat(p.person_name) person_name
+        a.dept_name, a.create_by, a.create_time, a.create_name, a.update_by, a.update_time, a.update_name
+        <if test="type == 1">
+            ,group_concat(p.lin_name) person_name
+        </if>
+        <if test="type == 2">
+            ,group_concat(p.name) person_name
+        </if>
+        <if test="type == 3">
+            ,group_concat(p.name) person_name
+        </if>
+        <if test="type == 6">
+            ,group_concat(p.name) person_name
+        </if>
         FROM centerdata_t_supermap_level a
-        LEFT JOIN centerdata_t_level_person_n p ON p.supermap_level_id = a.id
+        left join centerdata_t_level_person_n b on b.supermap_level_id = a.id
+        <if test="type == 1">
+            LEFT JOIN centerdata_t_forest_linleader p ON p.id = b.z_id
+        </if>
+        <if test="type == 2">
+            LEFT JOIN centerdata_t_hydraulic_river_length p ON p.id = b.z_id
+        </if>
+        <if test="type == 3">
+            LEFT JOIN centerdata_t_hydraulic_river_length p ON p.id = b.z_id
+        </if>
+        <if test="type == 6">
+            LEFT JOIN centerdata_t_hydraulic_river_length p ON p.id = b.z_id
+        </if>
         LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = a.dept_id
         <where>
             <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
@@ -45,7 +68,14 @@
             <if test="longitude != null  and longitude != ''">and longitude = #{longitude}</if>
             <if test="latitude != null  and latitude != ''">and latitude = #{latitude}</if>
             <if test="type != null  and type != ''">and a.type = #{type}</if>
-            <if test="personName != null and personName != ''">and p.person_name like concat('%',#{personName},'%')</if>
+            <if test="personName != null and personName != ''">
+                <choose>
+                    <when test="type == '1'">
+                        and p.lin_name like concat('%',#{personName},'%')
+                    </when>
+                    <otherwise>and p.name like concat('%',#{personName},'%')</otherwise>
+                </choose>
+            </if>
             <if test="deptId != null">
                 <choose>
                     <when test="deptName != null and deptName == 0">
@@ -126,7 +156,7 @@
     </delete>
 
     <select id="getDeviceList" parameterType="CenterdataTSupermapLevel" resultType="map">
-        SELECT a.id superMapId,a.name,a.longitude,a.latitude,b.camera_code cameraCode,b.camera_name cameraName
+        SELECT a.id superMapId,a.name,a.longitude,a.latitude,b.camera_code cameraCode,b.camera_name cameraName,a.type
         FROM centerdata_t_supermap_level a
         LEFT JOIN centerdata_t_equipment_camera eq ON eq.business_id = a.id
         LEFT JOIN ${database_monitor}.centermonitor_t_camera b ON b.id = eq.camera_id