Browse Source

Merge branch 'master' of http://git.cc-lotus.info/sckj/mz-cloud

nanMing 1 year ago
parent
commit
0049f582d5

+ 30 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WlfwXzqhController.java

@@ -104,30 +104,60 @@ public class WlfwXzqhController extends BaseController
         return AjaxResult.success(wlfwXzqhService.selectFwz(wlfwXzqh));
     }
 
+    @GetMapping("/fwz/dc")
+    public AjaxResult fwzdc(WlfwXzqh wlfwXzqh)
+    {
+        return AjaxResult.success(wlfwXzqhService.selectFwzdc(wlfwXzqh));
+    }
+
     @GetMapping("/lr")
     public AjaxResult lr(WlfwXzqh wlfwXzqh)
     {
         return AjaxResult.success(wlfwXzqhService.selectLr(wlfwXzqh));
     }
 
+    @GetMapping("/lr/dc")
+    public AjaxResult lrdc(WlfwXzqh wlfwXzqh)
+    {
+        return AjaxResult.success(wlfwXzqhService.selectLrdc(wlfwXzqh));
+    }
+
     @GetMapping("/fws")
     public AjaxResult fws(WlfwXzqh wlfwXzqh)
     {
         return AjaxResult.success(wlfwXzqhService.selectFws(wlfwXzqh));
     }
 
+    @GetMapping("/fws/dc")
+    public AjaxResult fwsdc(WlfwXzqh wlfwXzqh)
+    {
+        return AjaxResult.success(wlfwXzqhService.selectFwsdc(wlfwXzqh));
+    }
+
     @GetMapping("/sst")
     public AjaxResult sst(WlfwXzqh wlfwXzqh)
     {
         return AjaxResult.success(wlfwXzqhService.selectSst(wlfwXzqh));
     }
 
+    @GetMapping("/sst/dc")
+    public AjaxResult sstdc(WlfwXzqh wlfwXzqh)
+    {
+        return AjaxResult.success(wlfwXzqhService.selectSstdc(wlfwXzqh));
+    }
+
     @GetMapping("/znsb")
     public AjaxResult znsb(WlfwXzqh wlfwXzqh)
     {
         return AjaxResult.success(wlfwXzqhService.selectZnsb(wlfwXzqh));
     }
 
+    @GetMapping("/znsb/dc")
+    public AjaxResult znsbdc(WlfwXzqh wlfwXzqh)
+    {
+        return AjaxResult.success(wlfwXzqhService.selectZnsbdc(wlfwXzqh));
+    }
+
     @GetMapping("/xq")
     public AjaxResult xq(WlfwXzqh wlfwXzqh)
     {

+ 9 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WlfwXzqh.java

@@ -226,6 +226,14 @@ public class WlfwXzqh extends BaseEntity
     @ApiModelProperty(value = "区划检索串")
     @Size(max = 80, message = "{区划检索串}")
 
-    private String createQhjsc;
+    private String wlfws;
+
+    private String yljg;
+
+    private String znsb;
+
+    private String sqyljg;
+
+    private String jklx;
 
 }

+ 12 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WlfwXzqhMapper.java

@@ -18,11 +18,23 @@ public interface WlfwXzqhMapper extends BaseMapperPlus<WlfwXzqh> {
 
     public List<Map<String, Object>> selectFws(WlfwXzqh wlfwXzqh);
 
+    public Map<String, Object> selectFwsdc(String id);
+
     public List<Map<String, Object>> selectLr(WlfwXzqh wlfwXzqh);
 
+    public Map<String, Object> selectLrdc(String id);
+
     public List<Map<String, Object>> selectSst(WlfwXzqh wlfwXzqh);
 
+    public Map<String, Object> selectSstdc(String id);
+
     public List<Map<String, Object>> selectZnsb(WlfwXzqh wlfwXzqh);
 
+    public Map<String, Object> selectZnsbdc(String id);
+
+    public Map<String, Object> selectYljg(String id);
+
+    public Map<String, Object> selectYljgsq(String id);
+
     public List<WlfwXzqh> selectSqxq(WlfwXzqh wlfwXzqh);
 }

+ 10 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWlfwXzqhService.java

@@ -55,14 +55,24 @@ public interface IWlfwXzqhService
 
     public List<Map<String, Object>> selectFwz(WlfwXzqh wlfwXzqh);
 
+    public Map<String, Object> selectFwzdc(WlfwXzqh wlfwXzqh);
+
     public List<Map<String, Object>> selectLr(WlfwXzqh wlfwXzqh);
 
+    public Map<String, Object> selectLrdc(WlfwXzqh wlfwXzqh);
+
     public List<Map<String, Object>> selectFws(WlfwXzqh wlfwXzqh);
 
+    public Map<String, Object> selectFwsdc(WlfwXzqh wlfwXzqh);
+
     public List<Map<String, Object>> selectSst(WlfwXzqh wlfwXzqh);
 
+    public Map<String, Object> selectSstdc(WlfwXzqh wlfwXzqh);
+
     public List<Map<String, Object>> selectZnsb(WlfwXzqh wlfwXzqh);
 
+    public Map<String, Object> selectZnsbdc(WlfwXzqh wlfwXzqh);
+
     public Map<String, Object> selectXq(WlfwXzqh wlfwXzqh);
 
     public List<WlfwXzqh> selectSqxq(WlfwXzqh wlfwXzqh);

+ 29 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WlfwXzqhServiceImpl.java

@@ -102,6 +102,15 @@ public class WlfwXzqhServiceImpl implements IWlfwXzqhService
         return wlfwXzqhMapper.selectFwz(wlfwXzqh);
     }
 
+    @Override
+    public Map<String, Object> selectFwzdc(WlfwXzqh wlfwXzqh) {
+        Map<String, Object> res = wlfwXzqhMapper.selectYljg(wlfwXzqh.getId());
+        if (ObjectUtils.isEmpty(res)) {
+            return wlfwXzqhMapper.selectYljgsq(wlfwXzqh.getId());
+        }
+        return res;
+    }
+
     @Override
     public List<Map<String, Object>> selectFws(WlfwXzqh wlfwXzqh) {
         if (StringUtils.isEmpty(wlfwXzqh.getCode())) {
@@ -111,6 +120,11 @@ public class WlfwXzqhServiceImpl implements IWlfwXzqhService
         return wlfwXzqhMapper.selectFws(wlfwXzqh);
     }
 
+    @Override
+    public Map<String, Object> selectFwsdc(WlfwXzqh wlfwXzqh) {
+        return wlfwXzqhMapper.selectFwsdc(wlfwXzqh.getId());
+    }
+
     @Override
     public List<Map<String, Object>> selectLr(WlfwXzqh wlfwXzqh) {
         if (StringUtils.isEmpty(wlfwXzqh.getCode())) {
@@ -120,6 +134,11 @@ public class WlfwXzqhServiceImpl implements IWlfwXzqhService
         return wlfwXzqhMapper.selectLr(wlfwXzqh);
     }
 
+    @Override
+    public Map<String, Object> selectLrdc(WlfwXzqh wlfwXzqh) {
+        return wlfwXzqhMapper.selectLrdc(wlfwXzqh.getId());
+    }
+
     @Override
     public List<Map<String, Object>> selectSst(WlfwXzqh wlfwXzqh) {
         if (StringUtils.isEmpty(wlfwXzqh.getCode())) {
@@ -129,6 +148,11 @@ public class WlfwXzqhServiceImpl implements IWlfwXzqhService
         return wlfwXzqhMapper.selectSst(wlfwXzqh);
     }
 
+    @Override
+    public Map<String, Object> selectSstdc(WlfwXzqh wlfwXzqh) {
+        return wlfwXzqhMapper.selectSstdc(wlfwXzqh.getId());
+    }
+
     @Override
     public List<Map<String, Object>> selectZnsb(WlfwXzqh wlfwXzqh) {
         if (StringUtils.isEmpty(wlfwXzqh.getCode())) {
@@ -138,6 +162,11 @@ public class WlfwXzqhServiceImpl implements IWlfwXzqhService
         return wlfwXzqhMapper.selectZnsb(wlfwXzqh);
     }
 
+    @Override
+    public Map<String, Object> selectZnsbdc(WlfwXzqh wlfwXzqh) {
+        return wlfwXzqhMapper.selectZnsbdc(wlfwXzqh.getId());
+    }
+
     @Override
     public Map<String, Object> selectXq(WlfwXzqh wlfwXzqh) {
         Map<String, Object> res = new LinkedHashMap<>();

+ 35 - 0
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WlfwXzqhMapper.xml

@@ -32,6 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="qrs"    column="qrs"    />
         <result property="jlst"    column="jlst"    />
         <result property="zcd"    column="zcd"    />
+        <result property="wlfws"    column="wlfws"    />
+        <result property="yljg"    column="yljg"    />
+        <result property="znsb"    column="znsb"    />
+        <result property="sqyljg"    column="sqyljg"    />
+        <result property="jklx"    column="jklx"    />
         <result property="createTimeStr"    column="create_time_str"    />
         <result property="createUserId"    column="create_user_id"    />
         <result property="createBy"    column="create_by"    />
@@ -57,6 +62,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (select id, 'sqyljg' as lb, fxlb as fxlb, jgmc as mc, lat, lng from yljgsq_jcxx where szxzqh like concat(#{code}, '%') and sczt = '01')
     </select>
 
+    <select id="selectYljg" parameterType="String" resultType="java.util.Map">
+        -- 养老机构单查
+        select * from yljg_jcxx where id = #{id}
+    </select>
+
+    <select id="selectYljgsq" parameterType="String" resultType="java.util.Map">
+        -- 社区养老机构单查
+        select * from yljgsq_jcxx where id = #{id}
+    </select>
+
     <select id="selectLr" parameterType="WlfwXzqh" resultType="java.util.Map">
         -- 老人
         select id, xm, lat, lng, 'jg' as lb from v_yljg_kh_jg where szxzqh like concat(#{code}, '%') and sczt = '01'
@@ -64,21 +79,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, xm, lat, lng, 'sqjg' as lb from v_yljg_kh_sqjg where szxzqh like concat(#{code}, '%') and sczt = '01'
     </select>
 
+    <select id="selectLrdc" parameterType="String" resultType="java.util.Map">
+        -- 老人单查
+        select * from yljg_kh_jbxx where id = #{id}
+    </select>
+
     <select id="selectFws" parameterType="WlfwXzqh" resultType="java.util.Map">
         -- 为老服务商
         select id, jgxz as lb, jgfl as fxlb, jgmc as mc, lat, lng from wlfw_jg where xzqh like concat(#{code}, '%')
     </select>
 
+    <select id="selectFwsdc" parameterType="String" resultType="java.util.Map">
+        -- 为老服务商单查
+        select * from wlfw_jg where id = #{id}
+    </select>
+
     <select id="selectSst" parameterType="WlfwXzqh" resultType="java.util.Map">
         -- 摄像头
         select id, lat, lng, sstbh, sstwzms, cj, spjrdz, is_yckz, zt from wlfw_sst where create_area_code like concat(#{code}, '%')
     </select>
 
+    <select id="selectSstdc" parameterType="String" resultType="java.util.Map">
+        -- 摄像头单查
+        select * from wlfw_sst where id = #{id}
+    </select>
+
     <select id="selectZnsb" parameterType="WlfwXzqh" resultType="java.util.Map">
         -- 智能设备
         select wlfw_jkyj.id, sblb as lb, sbmc as mc, sccj as sccj, yljg_jcxx.lat, yljg_jcxx.lng from wlfw_jkyj left join yljg_jcxx on yljg_jcxx.id = wlfw_jkyj.jg_id where wlfw_jkyj.create_area_code like concat(#{code}, '%')
     </select>
 
+    <select id="selectZnsbdc" parameterType="String" resultType="java.util.Map">
+        -- 智能设备单查
+        select * from wlfw_jkyj where id = #{id}
+    </select>
+
     <select id="selectSqxq" parameterType="WlfwXzqh" resultMap="WlfwXzqhResult">
         -- 社区
         select * from wlfw_xzqh where code in (select code from sys_dept_jl where find_in_set(#{code}, ancestors) and level = 5) and lat is not null and lng is not null