Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_yunwei_java

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java

@@ -215,4 +215,17 @@ public class NuBaseInfoController extends JeecgController<NuBaseInfo, INuBaseInf
         nuBaseInfoService.batchAdd(nuBaseInfo);
         return Result.ok("新增成功！");
     }
+
+
+
+    /**
+     * 获取护理单元及物联设备数量
+     * @param nuBaseInfo
+     * @return
+     */
+    @GetMapping(value = "/getBaseWlsbList")
+    public Result<List<NuBaseInfo>> getBaseWlsbList(NuBaseInfo nuBaseInfo) {
+        List<NuBaseInfo> pageList = nuBaseInfoService.getBaseWlsbList(nuBaseInfo);
+        return Result.OK(pageList);
+    }
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/entity/NuBaseInfo.java

@@ -86,4 +86,15 @@ public class NuBaseInfo implements Serializable {
     private String orgCode;
     @TableField(exist = false)
     private List<NuBaseBatchAddDto> batchAddList;
+
+    @TableField(exist = false)
+    private Integer sxtNum;
+    @TableField(exist = false)
+    private Integer dbNum;
+    @TableField(exist = false)
+    private Integer sbNum;
+    @TableField(exist = false)
+    private Integer wsdjNum;
+    @TableField(exist = false)
+    private String areaFlagText;
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/NuBaseInfoMapper.java

@@ -20,4 +20,5 @@ public interface NuBaseInfoMapper extends BaseMapper<NuBaseInfo> {
 
     int batchDel(@Param("ids") List<String> ids);
 
+    List<NuBaseInfo> getBaseWlsbList(NuBaseInfo nuBaseInfo);
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/xml/NuBaseInfoMapper.xml

@@ -20,4 +20,21 @@
             #{id}
         </foreach>
     </delete>
+
+
+    <select id="getBaseWlsbList" parameterType="com.nu.modules.nuBaseInfo.entity.NuBaseInfo" resultType="com.nu.modules.nuBaseInfo.entity.NuBaseInfo">
+        select a.*,
+        (select count(*) num from nu_iot_tplink_camera cam where cam.nu_id = a.nu_id ) as sxtNum,
+        (select count(*) num from nu_iot_tq_electricity_meter ele where ele.nu_id = a.nu_id ) as dbNum,
+        (select count(*) num from nu_iot_tq_water_meter wat where wat.nu_id = a.nu_id ) as sbNum,
+        (select count(*) num from nu_iot_yiweilian_humid_device wat where wat.nu_id = a.nu_id ) as wsdjNum,
+        b.item_text as area_flag_text
+        from nu_base_info a
+        left join sys_dict_item b on a.area_flag = b.item_value and b.dict_id = '1935949775453859841'
+        <where>
+            <if test="orgCode != null and orgCode != ''">
+                and a.sys_org_code = #{orgCode}
+            </if>
+        </where>
+    </select>
 </mapper>

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/INuBaseInfoService.java

@@ -23,4 +23,6 @@ public interface INuBaseInfoService extends IService<NuBaseInfo> {
     int batchAdd(NuBaseInfo nuBaseInfo);
 
     void upIzSyncByIds(String ids);
+
+    List<NuBaseInfo> getBaseWlsbList(NuBaseInfo nuBaseInfo);
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java

@@ -97,4 +97,9 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
         nuBaseInfo.setIzSync("0");
         baseMapper.update(nuBaseInfo,qw);
     }
+
+    @Override
+    public List<NuBaseInfo> getBaseWlsbList(NuBaseInfo nuBaseInfo) {
+        return baseMapper.getBaseWlsbList(nuBaseInfo);
+    }
 }

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml

@@ -61,6 +61,9 @@
             <if test="params.regionId != null and params.regionId != ''">
                 AND a.region_id = #{params.regionId}
             </if>
+            <if test="params.nuId != null and params.nuId != ''">
+                AND a.nu_id = #{params.nuId}
+            </if>
         </where>
     </select>