浙江设备平台接口开发

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java

@@ -54,7 +54,7 @@ public interface WaterResourceMapper extends BaseMapper<WaterResource> {
 
     Map<String, Object> getResourcesCount();
 
-    List<String> getPoolEquipIds(@Param("bizOrgCode") String bizOrgCode);
+    List<String> getPoolEquipIds(@Param("id") String id);
 
-    List<String> getOtherResourceEquipIds(@Param("bizOrgCode") String bizOrgCode, @Param("type") String type);
+    List<String> getOtherResourceEquipIds(@Param("id") String bizOrgCode, @Param("type") String type);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -294,8 +294,8 @@
             left join cb_water_resource_pool rp on r.sequence_nbr = rp.resource_id
         where
             level_device_id IS NOT NULL
-        <if test="bizOrgCode != null and bizOrgCode != ''">
-            AND r.biz_org_code LIKE concat(#{bizOrgCode}, '%')
+        <if test="id != null and id != ''">
+            AND r.sequence_nbr = #{id}
         </if>
     </select>
 
@@ -305,8 +305,8 @@
         from
             cb_water_resource r
         <where>
-            <if test="bizOrgCode != null and bizOrgCode != ''">
-                r.biz_org_code LIKE concat(#{bizOrgCode}, '%')
+            <if test="id != null and id != ''">
+                r.sequence_nbr = #{id}
             </if>
             <if test="type != null and type != ''">
                 AND r.resource_type LIKE concat(#{type}, '%')

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/UnitTransformUtil.java

@@ -33,10 +33,10 @@ public class UnitTransformUtil {
                     if (nowVal.compareTo(new BigDecimal(minValue)) < 0) {
                         map.put("status", "0");
                         map.put("abs", nowVal.divide(new BigDecimal(maxValue),2,BigDecimal.ROUND_HALF_UP).movePointRight(2));
-                    } else if (nowVal.compareTo(new BigDecimal(maxValue)) == 1) {
+                    } else if (nowVal.compareTo(new BigDecimal(maxValue)) == 0) {
                         map.put("status", "2");
                         map.put("abs", 100);
-                    } else if (nowVal.compareTo(new BigDecimal(maxValue)) == 0) {
+                    } else if (nowVal.compareTo(new BigDecimal(0)) == 0) {
                         map.put("status", "1");
                         map.put("abs", "--");
                     } else {

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

@@ -646,10 +646,7 @@ public class WaterResourceController extends BaseController {
         Page<Map<String, Object>> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
-        if (StringUtils.isEmpty(bizOrgCode)) {
-            ReginParams reginParams = getSelectedOrgInfo();
-            bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
-        }
+
         return CommonResponseUtil.success(waterResourceServiceImpl.getWaterInfoEquipListPage(page, bizOrgCode, id));
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -822,6 +822,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			}
 			updateChildOrgCode(oldOrgUsr.getBizOrgCode(), orgUsr.getBizOrgCode());
 		}
+		orgUsr.setPersonStatus(oldOrgUsr.getPersonStatus());
 		AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
 		orgUsr.setRecDate(new Date());
 		orgUsr.setRecUserId(me.getUserId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java

@@ -517,7 +517,7 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
         WaterResource resource = this.waterResourceMapper.selectById(id);
         String type = resource.getResourceType();
         if ("pool".equalsIgnoreCase(type)) {
-            List<String> equipIds = this.waterResourceMapper.getPoolEquipIds(bizOrgCode);
+            List<String> equipIds = this.waterResourceMapper.getPoolEquipIds(id);
             String ids = Joiner.on(",").join(equipIds);
             ResponseModel<List<Map<String, Object>>> response = equipFeignClient.getListByEquipmentSpesById(ids, "1");
             if (response.getStatus() != 200) {
@@ -525,7 +525,7 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
             }
             page.setRecords((response.getResult()));
         } else {
-            List<String> equipmentIds = this.waterResourceMapper.getOtherResourceEquipIds(bizOrgCode, type);
+            List<String> equipmentIds = this.waterResourceMapper.getOtherResourceEquipIds(id, type);
             String equipIdStr = Joiner.on(",").join(equipmentIds);
             ResponseModel<List<Map<String, Object>>> response = equipFeignClient.getListByEquipmentSpesById(equipIdStr, "0");
             if (response.getStatus() != 200) {

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -6140,7 +6140,7 @@
                     'red'
                 END AS statusCode
         from
-            (select * from cb_water_resource where resource_type = 'industryPool' or resource_type = 'pool') a
+            (select * from cb_water_resource  where is_delete = 1 and (resource_type = 'industryPool' or resource_type = 'pool')) a
         <where>
             <if test="bizOrgCode != null and bizOrgCode != ''">
                 biz_org_code like concat(#{bizOrgCode}, '%')