Merge branch 'develop_dl_plan6_temp' of…

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

@@ -109,10 +109,20 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         if (0 == list.size()) {
             throw new RuntimeException("导出数据列表无数据！");
         }
+
+        if(alarmType.equals("FIREALARM")){
+            ExcelUtil.createTemplate(response, "设备火灾报警信息", "设备火灾报警信息", equipmentDownloads, EquipmentAlarmDownloadVO.class, null, false);
+
+        }else if(alarmType.equals("BREAKDOWN")){
+            ExcelUtil.createTemplate(response, "设备故障告警信息", "设备故障告警信息", equipmentDownloads, EquipmentAlarmDownloadVO.class, null, false);
+
+        }else{
             ExcelUtil.createTemplate(response, "设备告警信息", "设备告警信息", equipmentDownloads, EquipmentAlarmDownloadVO.class, null, false);
 
         }
 
+    }
+
     public List<EquipmentAlarmDownloadVO> handleExportData(List<Long> ids, List<HashMap<String, Object>> list) {
         List<EquipmentAlarmDownloadVO> equipmentDownloads = new ArrayList<>();
         if (!ObjectUtils.isEmpty(ids) && 0 < ids.size()) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -1133,36 +1133,36 @@ public class PointServiceImpl implements IPointService {
         Map<String, Object> resp = new HashMap<String, Object>();
         Map<String, Object> point = pointMapper.getPointById(id);
 
-        if (StringUtil.isNotEmpty(point.get("depid"))) {
-            List<LinkedHashMap> departmentBos = remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, point.get("depid") + "");
-            if (departmentBos != null && departmentBos.size() > 0) {
-                for (int i = 0; i < departmentBos.size(); i++) {
-                    point.put("departmentName", departmentBos.get(i).get("departmentName"));
-
-
-                }
-            }
-
-        }
+//        if (StringUtil.isNotEmpty(point.get("depid"))) {
+//            List<LinkedHashMap> departmentBos = remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, point.get("depid") + "");
+//            if (departmentBos != null && departmentBos.size() > 0) {
+//                for (int i = 0; i < departmentBos.size(); i++) {
+//                    point.put("departmentName", departmentBos.get(i).get("departmentName"));
+//
+//
+//                }
+//            }
+//
+//        }
 
         // deptName = checkPointBo.getExecuteDeptId();
-        if (StringUtil.isNotEmpty(point.get("userName"))) {
-            List<AgencyUserModel> userModels = remoteSecurityService.listUserByUserIds(toke, product, appKey, point.get("userName") + "");
-            String userName = "";
-            if (userModels != null && userModels.size() > 0) {
-                for (int i = 0; i < userModels.size(); i++) {
-                    if (i == userModels.size() - 1) {
-                        userName = userName + userModels.get(i).getRealName();
-                    } else {
-                        userName = userName + userModels.get(i).getRealName() + ",";
-                    }
-
-                }
-                point.put("userName", userName);
-            }
-
-
-        }
+//        if (StringUtil.isNotEmpty(point.get("userName"))) {
+//            List<AgencyUserModel> userModels = remoteSecurityService.listUserByUserIds(toke, product, appKey, point.get("userName") + "");
+//            String userName = "";
+//            if (userModels != null && userModels.size() > 0) {
+//                for (int i = 0; i < userModels.size(); i++) {
+//                    if (i == userModels.size() - 1) {
+//                        userName = userName + userModels.get(i).getRealName();
+//                    } else {
+//                        userName = userName + userModels.get(i).getRealName() + ",";
+//                    }
+//
+//                }
+//                point.put("userName", userName);
+//            }
+//
+//
+//        }
 
 
 

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -212,7 +212,7 @@
 <!--		,prpi.id  as routePointItemId-->
 		FROM
 		p_point_classify ppc
-		LEFT JOIN p_point_inputitem ppi ON ppi.classify_ids = ppc.id
+		LEFT JOIN p_point_inputitem ppi ON ppi.classify_ids = ppc.id and ppc.point_id=ppi.point_id
 		LEFT JOIN p_input_item pii ON pii.id = ppi.input_item_id
 <!--		lEFT JOIN p_route_point_item prpi ON prpi.point_input_item_id = pii.id-->
 		WHERE pii.is_delete = '0'

amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml

@@ -335,7 +335,7 @@
 					'移动点'
 			END) fixed,
 		  p.charge_person_name userName,
-			p.charge_dept_id depid,
+		p.biz_org_name departmentName,
 		    IFNULL(p.risk_source_id, '') as buildingId,
 			p.remark,
 			p.offline