Merge remote-tracking branch 'origin/develop_dl_3.7.0.9' into develop_dl_3.7.0.9

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

@@ -3292,9 +3292,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		if ("1601".equals(type)) {
 			deleteFirefighters(id);
 		}
-		//  巡检站端与中心级数据同步
 
+		// 4.解决人员更换岗位类型然后删除，App打卡还有脏数据问题
+		firefightersService.update(new UpdateWrapper<Firefighters>().eq("org_usr_id", id).set("is_delete", 1));
 
+		//  巡检站端与中心级数据同步
 		TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
 			@Override
 			public void afterCommit() {

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

@@ -899,9 +899,18 @@ public class TopographyController extends AbstractBaseController {
                 String json = JSON.toJSONString(entity.getResult());
                 List<Map<String, String>> listObject = (List<Map<String, String>>) JSONArray.parse(json);
                 List<IotDataVO> vos = new ArrayList<>();
+                Map<String, List<Date>> dateMap = new HashMap<>();
                 for (Map<String, String> mapList : listObject) {
                     for (Map.Entry entry : mapList.entrySet()) {
-                        if (!"name".equals(entry.getKey()) && !"deviceName".equals(entry.getKey())) {
+                        if (!"name".equals(entry.getKey()) && !"deviceName".equals(entry.getKey()) && !"time".equals(entry.getKey()) && !"createdTime".equals(entry.getKey())) {
+                            if (!dateMap.containsKey(entry.getKey())) {
+                                ArrayList<Date> dates1 = new ArrayList<>();
+                                dates1.add(dateParse(mapList.get("time")));
+                                dateMap.put(entry.getKey().toString(), dates1);
+                            } else {
+                                dateMap.get(entry.getKey()).add(dateParse(mapList.get("time")));
+                            }
+
                             IotDataVO vo = new IotDataVO();
                             vo.setKey(String.valueOf(entry.getKey()));
                             vo.setValue(String.valueOf(entry.getValue()));
@@ -909,25 +918,15 @@ public class TopographyController extends AbstractBaseController {
                         }
                     }
                 }
-                Map<String, List<Date>> dateMap = new HashMap<>();
-                for (int i = 0; i < vos.size(); i = i + 2) {
-                    Date useDate = null;
-                    String indexKey = null;
-                    if (vos.get(i).getKey().equals("time")) {
-                        useDate = dateParse(vos.get(i).getValue().toString());
-                        indexKey = String.valueOf(vos.get(i + 1).getKey());
-                    } else {
-                        useDate = dateParse(vos.get(i).getValue().toString());
-                        indexKey = String.valueOf(vos.get(i).getKey());
-                    }
-                    if (!dateMap.containsKey(indexKey)) {
-                        ArrayList<Date> dates1 = new ArrayList<>();
-                        dates1.add(useDate);
-                        dateMap.put(indexKey, dates1);
-                    } else {
-                        dateMap.get(indexKey).add(useDate);
-                    }
-                }
+//                for (int i = 0; i < vos.size(); i = i + 2) {
+//                    Date useDate = null;
+//                    String indexKey = null;
+//                    if (vos.get(i).getKey().equals("time")) {
+//                        useDate = dateParse(vos.get(i).getValue().toString());
+//                        indexKey = String.valueOf(vos.get(i + 1).getKey());
+//                    }
+//
+//                }
                 List<EquipmentSpecificIndex> indexes = equipmentSpecificIndexMapper.getEquipmentSpeIndexByIotCodeAndTrend(iotCode);
                 if (0 < indexes.size()) {
                     List<TopographyIotIndexTrendVo> list = new ArrayList<>();