至少一次巡查触发逻辑

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

@@ -1082,6 +1082,35 @@ public class OrgUsrController extends BaseController {
 			return ResponseHelper.buildResponse(getCompanyNameById(orgUsr.getParentId()));
 		}
 	}
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "查询公司bizOrgCode", notes = "查询公司bizOrgCode")
+	@GetMapping(value = "/getCompanyBiz")
+	public ResponseModel<Map<String, Object>> getCompanyBiz(@RequestParam("bizOrgCode") String bizOrgCode) {
+		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
+		lambda.eq(OrgUsr::getBizOrgCode, bizOrgCode);
+		lambda.eq(OrgUsr::getIsDelete, false);
+		if(orgUsrMapper.selectList(lambda).size() > 0) {
+			Map map = new HashMap();
+			OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
+			try {
+				OrgUsrFormDto orgUsrFormDto = iOrgUsrService.selectCompanyById(orgUsr.getSequenceNbr());
+				map.put("bizOrgCode", orgUsrFormDto.getBizOrgCode());
+				map.put("bizOrgName", orgUsrFormDto.getBizOrgName());
+				map.put("parentName", orgUsrFormDto.getParentName());
+				map.put("companyPhone", orgUsrFormDto.getDynamicFormAlert().stream().filter(e->e.getKey().equals("companyPhone")).findFirst().get().getValue());
+				map.put("code", orgUsrFormDto.getCode());
+				map.put("dwfz", orgUsrFormDto.getDwfz());
+				map.put("xfaq", orgUsrFormDto.getXfaq());
+				map.put("xfgl", orgUsrFormDto.getXfgl());
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return ResponseHelper.buildResponse(map);
+		} else {
+			return ResponseHelper.buildResponse(null);
+		}
+
+	}
 	private String getCompanyNameById(String id) {
 		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
 		lambda.eq(OrgUsr::getSequenceNbr, id);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificIndexMapper.java

@@ -112,7 +112,9 @@ public interface EquipmentSpecificIndexMapper extends BaseMapper<EquipmentSpecif
 
     List<Map<String, Object>> getEquipSpecificScrap();
 
-    Map<String, Object> patrolTaskStatic();
+    List<Map<String, Object>> patrolTaskStatic();
+
+    List<Map<String, Object>> patrolTaskQuery(String bizOrgCode);
 
     List<EquipmentSpecificIndex> getEquipIndexInIndex(@Param("list") List<String> listIndex);
 

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

@@ -2004,18 +2004,38 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Scheduled(cron = "${equip.patrol.cron:0 0 9 * * ?}")
     @Transactional(rollbackFor = Exception.class)
     public void patrolTaskStatic() throws Exception {
-        Map<String, Object> mapPatrol = equipmentSpecificIndexMapper.patrolTaskStatic();
+        List<Map<String, Object>> mapPatrol = equipmentSpecificIndexMapper.patrolTaskStatic();
+        for (Map<String, Object> m : mapPatrol
+             ) {
+            // 判断是否一次巡查都没有
+            if(m.get("isFinishOnce").toString().equals("0")) {
+                if(m.get("planNum").toString().equals("1")) {
                     Map<String, String> map = new HashMap<>();
-        map.put("isFinishOnce", mapPatrol.get("isFinishOnce").toString());
-        map.put("taskNum", mapPatrol.get("taskNum").toString());
-        map.put("planNum", mapPatrol.get("planNum").toString());
-        map.put("bizOrgCode", mapPatrol.get("bizOrgCode").toString());
-        map.put("bizOrgName", mapPatrol.get("bizOrgName").toString());
+                    map.put("planName", m.get("planName").toString());
+                    map.put("bizOrgCode", m.get("bizOrgCode").toString());
+                    map.put("bizOrgName", m.get("bizOrgName").toString());
                     try {
                         emqKeeper.getMqttClient().publish("equip/patrol/put", JSONObject.toJSONString(map).getBytes(), 1, false);
                     } catch (MqttException exp) {
                         log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
                     }
+                } else if(Integer.parseInt(m.get("planNum").toString()) > 1){
+                    List<Map<String, Object>> mapPatrolTask = equipmentSpecificIndexMapper.patrolTaskQuery(m.get("bizOrgCode").toString());
+                    for (Map<String, Object> m1:mapPatrolTask
+                         ) {
+                        Map<String, String> map = new HashMap<>();
+                        map.put("planName", m1.get("planName").toString());
+                        map.put("bizOrgCode", m1.get("bizOrgCode").toString());
+                        map.put("bizOrgName", m1.get("bizOrgName").toString());
+                        try {
+                            emqKeeper.getMqttClient().publish("equip/patrol/put", JSONObject.toJSONString(map).getBytes(), 1, false);
+                        } catch (MqttException exp) {
+                            log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
+                        }
+                    }
+                }
+            }
+        }
     }
 
     void syncSystemctlMsg(Map<String, Object> map, String scrapTime, int i) {

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

@@ -504,6 +504,7 @@
             IFNULL( sum( 1 ), 0 ) AS taskNum,
             pp.biz_org_code bizOrgCode,
             pp.biz_org_name bizOrgName,
+            ppt.plan_name planName,
             (
                 SELECT
                     count( 1 )
@@ -514,6 +515,7 @@
             `p_plan_task` ppt
                 LEFT JOIN `p_plan` pp ON pp.id = ppt.plan_id
         where ppt.check_date  =  DATE_FORMAT( now(), '%Y-%m-%d' )
+        GROUP BY biz_org_code
     </select>
     <select id="getEquipIndexInIndex" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">
         SELECT
@@ -595,4 +597,16 @@
             </if>
         </where>
     </select>
+    <select id="patrolTaskQuery" resultType="java.util.Map">
+        SELECT
+            pp.biz_org_code bizOrgCode,
+            pp.biz_org_name bizOrgName,
+            ppt.plan_name planName
+        FROM
+            `p_plan_task` ppt
+                LEFT JOIN `p_plan` pp ON pp.id = ppt.plan_id
+        where ppt.check_date =  DATE_FORMAT( now(), '%Y-%m-%d' )
+        and biz_org_code = #{bizOrgCode}
+        GROUP BY plan_name
+    </select>
 </mapper>
\ No newline at end of file