bug修改

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

@@ -164,6 +164,9 @@
             <if test="map.positionType != null and map.positionType != ''">
             AND FIND_IN_SET(#{map.positionType},g.positionType)
             </if>
+            <if test="map.peopleType != null and map.peopleType != ''">
+                AND g.peopleType = #{map.peopleType}
+            </if>
             GROUP BY
             u.sequence_nbr ,
             u.biz_org_name ,

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

@@ -604,12 +604,19 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			map.put("positionType", positionType);
 		}
 
+		String peopleType = "";
+		if(req.containsKey("peopleType")) {
+			peopleType = req.get("peopleType").toString();
+			map.put("peopleType", peopleType);
+		}
+
 		req.remove("pageSize");
 		req.remove("pageNum");
 		req.remove("parentId");
 		req.remove("amosOrgId");
 		req.remove("company");
 		req.remove("positionType");
+		req.remove("peopleType");
 		req.remove("bizOrgName");
 		map.put("fieldsValue", req);
 		map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BigScreenController.java

@@ -114,8 +114,8 @@ public class BigScreenController extends AbstractBaseController {
             ResponseModel entity1 = null;
             ResponseModel entity2 = null;
             try {
-                entity1 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),iotCode, startDateStr, nowStrLong,  "true", pressurePumpStart);
-                entity2 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),iotCode, startDateStr, nowStrLong,  "false", pressurePumpStart);
+                entity1 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),prefix,suffix, startDateStr, nowStrLong,  "true", pressurePumpStart);
+                entity2 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),prefix,suffix, startDateStr, nowStrLong,  "false", pressurePumpStart);
             } catch (Exception e) {
                 e.printStackTrace();
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -332,8 +332,8 @@ public class ConfigureController extends AbstractBaseController {
             ResponseModel entity1 = null;
             ResponseModel entity2 = null;
             try {
-                entity1 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),iotCode, startDateStr, nowStrLong,  "true", pressurePumpStart);
-                entity2 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),iotCode, startDateStr, nowStrLong,  "false", pressurePumpStart);
+                entity1 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),prefix,suffix, startDateStr, nowStrLong,  "true", pressurePumpStart);
+                entity2 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),prefix,suffix, startDateStr, nowStrLong,  "false", pressurePumpStart);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -393,8 +393,8 @@ public class ConfigureController extends AbstractBaseController {
                 ResponseModel entity1 = null;
                 ResponseModel entity2 = null;
                 try {
-                    entity1 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),iotCode, startDateStr, nowStrLong,  "true", pressurePumpStart);
-                    entity2 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),iotCode, startDateStr, nowStrLong,  "false", pressurePumpStart);
+                    entity1 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),prefix,suffix, startDateStr, nowStrLong,  "true", pressurePumpStart);
+                    entity2 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),prefix,suffix, startDateStr, nowStrLong,  "false", pressurePumpStart);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/IotFeign.java

@@ -57,6 +57,7 @@ public interface IotFeign {
             @RequestHeader("product") String product,
             @RequestHeader("token") String token,
             @RequestParam(value = "measurement") String measurement,
+            @RequestParam( required = false, value = "deviceName") String deviceName,
             @RequestParam(value = "timeStart") String beginDate,
             @RequestParam(value = "timeEnd") String endDate,
             @RequestParam("FHS_PressurePump_Start") String key,

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java

@@ -239,7 +239,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
                     suffix = iotCode.toString().substring(8);
                     ResponseModel responseModel = null;
                     try {
-                        responseModel = iotFeign.selectListNew(appKey, product, token, prefix, startTime, endTime, null, pressurePumpStart);
+                        responseModel = iotFeign.selectListNew(appKey, product, token, prefix,null, startTime, endTime, null, pressurePumpStart);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -319,9 +319,9 @@ public class EmergencyServiceImpl implements IEmergencyService {
         AtomicInteger twoNum = new AtomicInteger();
         if (!CollectionUtils.isEmpty(specificList)) {
             String prefix = null;
+            String suffix = null;
             for (Map<String, Object> x : specificList) {
                 Object iotCode = x.get("iotCode");
-                String suffix = null;
                 if (x.get("iotCode") != null && iotCode.toString().length() > 8) {
                     prefix = iotCode.toString().substring(0, 8);
                     suffix = iotCode.toString().substring(8);
@@ -364,7 +364,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
                                 //  停泵前的前5分钟，判断管网压力状态
                                 try {
                                     String stop5BeforeTime = DateUtils.convertDateToString(DateUtils.dateAddMinutes(DateUtils.convertStrToDate(intervalTime, "yyyy-MM-dd HH:mm:ss"), -5), "yyyy-MM-dd HH:mm:ss");
-                                    ResponseModel pipeResponseModel = iotFeign.selectListNew(appKey, product, token, prefix, stop5BeforeTime, intervalTime, null, "FHS_PipePressureDetector_PipePressure");
+                                    ResponseModel pipeResponseModel = iotFeign.selectListNew(appKey, product, token, prefix, null, stop5BeforeTime, intervalTime, null, "FHS_PipePressureDetector_PipePressure");
                                     if (200 == pipeResponseModel.getStatus()) {
                                         String pipeJson = JSON.toJSONString(pipeResponseModel.getResult());
                                         List<Map<String, String>> pipeDataList = (List<Map<String, String>>) JSONArray.parse(pipeJson);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -789,7 +789,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
             vo = equipmentSpecificMapper.getEquipmentSpecificIotCodeWYB().get(0);
         }
         int startNum = Integer.parseInt(stringObjectMap.get("startNum").toString());
-        ResponseModel start = iotFeign.selectListNew(remoteSecurityService.getServerToken().getAppKey(), remoteSecurityService.getServerToken().getProduct(), remoteSecurityService.getServerToken().getToke(), vo.getIotCode().substring(0,8), startTime, endTime,"true", pressurePumpStart);
+        ResponseModel start = iotFeign.selectListNew(remoteSecurityService.getServerToken().getAppKey(), remoteSecurityService.getServerToken().getProduct(), remoteSecurityService.getServerToken().getToke(), vo.getIotCode().substring(0,8),null, startTime, endTime,"true", pressurePumpStart);
         if (200 == start.getStatus() && !ObjectUtils.isEmpty(start.getResult())) {
             String json1 = JSON.toJSONString(start.getResult());
             List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);