解决冲突

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/TaskTypeStationEnum.java

@@ -7,7 +7,9 @@ public enum  TaskTypeStationEnum {
     经销商审核("经销商审核", "经销商审核"),
     电站勘察("电站勘察", "电站勘察"),
     电站审核("电站审核", "电站审核"),
-    合同填报("合同填报", "合同填报");
+    合同填报("合同填报", "合同填报"),
+    重置密码("重置密码", "重置密码"),
+    设置管理员("设置管理员", "设置管理员");
     /**
      * 名称，描述
      */

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
@@ -34,6 +35,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServiceImpl;
+import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,7 +70,8 @@ public class HouseholdContractController extends BaseController {
 
     @Autowired
     PeasantHouseholdServiceImpl peasantHouseholdServiceImpl;
-
+    @Autowired
+    protected EmqKeeper emqKeeper;
     @Value("${dealer.engineering}")
     private String engineering;
     @Autowired
@@ -196,7 +199,7 @@ public class HouseholdContractController extends BaseController {
 
         //生成填报任务
         ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContrac.getSequenceNbr(),  "用户"+householdContrac.getPartyA()+"合同盖章",householdContrac.getDealerCode());
-        toDoTasksServiceImpl.addToDoTasksByRole(engineering,toDoTasks1);
+        toDoTasksServiceImpl.addToDoTasksByRole(engineering,toDoTasks1,"发起合同成功");
 
 
         return ResponseHelper.buildResponse(householdContractServiceImpl.updateById(householdContrac));
@@ -212,8 +215,9 @@ public class HouseholdContractController extends BaseController {
 
     @Transactional
     public boolean stampdata(Long sequenceNbr){
-
-        HouseholdContract householdContrac=  householdContractServiceImpl.getById(sequenceNbr);
+        HouseholdContract householdContrac=null;
+        try {
+         householdContrac=  householdContractServiceImpl.getById(sequenceNbr);
         householdContrac.setStampStatus(HouseholdContractEnum.盖章状态_已盖章.getCode());
         householdContrac.setSigningTime(new Date());
         householdContrac.setStatus(HouseholdContractEnum.合同状态_双方已签署.getCode());
@@ -228,10 +232,19 @@ public class HouseholdContractController extends BaseController {
             doTasks.setState("已办");
             doTasks.setCompleteTime(new Date());
             toDoTasksMapper.updateById(doTasks);
+            emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false);
+
             UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成",  doTasks.getAmosOrgCode());
             userMessageMapper.insert(userMessage);
+            emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
+
+        }
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new RuntimeException("系统异常");
         }
         return householdContractServiceImpl.updateById(householdContrac);
+
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -245,7 +258,9 @@ public class HouseholdContractController extends BaseController {
 
     @Transactional
     public boolean canceldata(Long sequenceNbr){
-        HouseholdContract householdContrac=  householdContractServiceImpl.getById(sequenceNbr);
+        HouseholdContract householdContrac=null;
+        try {
+        householdContrac=  householdContractServiceImpl.getById(sequenceNbr);
         householdContrac.setStatus(HouseholdContractEnum.合同状态_已作废.getCode());
         LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.合同填报.getCode());
@@ -255,8 +270,16 @@ public class HouseholdContractController extends BaseController {
         if(doTasks!=null){
             doTasks.setState("作废");
             toDoTasksMapper.updateById(doTasks);
+            emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false);
+
             UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已作废",  doTasks.getAmosOrgCode());
             userMessageMapper.insert(userMessage);
+            emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
+
+        }
+    }catch (Exception e){
+        e.printStackTrace();
+        throw new RuntimeException("系统异常");
     }
         return householdContractServiceImpl.updateById(householdContrac);
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PersonnelBusinessController.java

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDtoUserDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserDataDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PersonnelBusiness;
+import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.UserMessageMapper;
 import com.yeejoin.amos.boot.module.standard.api.entity.PublicAgencyUser;
 import com.yeejoin.amos.boot.module.standard.api.mapper.PublicAgencyUserMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -21,6 +25,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import java.util.Date;
 import java.util.List;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PersonnelBusinessServiceImpl;
+import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -49,6 +54,10 @@ public class PersonnelBusinessController extends BaseController {
     PublicAgencyUserMapper publicAgencyUserMapper;
     @Autowired
     PersonnelBusinessMapper personnelBusinessMapper;
+    @Autowired
+    protected EmqKeeper emqKeeper;
+    @Autowired
+    UserMessageMapper userMessageMapper;
     /**
      * 新增人员业务信息表
      *
@@ -206,12 +215,27 @@ public class PersonnelBusinessController extends BaseController {
     @GetMapping(value = "/czPassword")
     @ApiOperation(httpMethod = "GET",value = "重置密码",  notes = "重置密码")
     public ResponseModel<UserDataDto> czPassword(String id) {
-        PublicAgencyUser publicAgencyUser= publicAgencyUserMapper.selectById(id);
+	    try {
 
+
+        PublicAgencyUser publicAgencyUser= publicAgencyUserMapper.selectById(id);
         FeignClientResult data=Privilege.agencyUserClient.restorePassword(publicAgencyUser.getAmosUserId());
+        LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
+        qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUser.getSequenceNbr());
+        PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug);
+        UserMessage userMessage=  new UserMessage( TaskTypeStationEnum.重置密码.getCode(), publicAgencyUser.getSequenceNbr() ,  publicAgencyUser.getAmosUserId(),  new Date(),   "您的密码已重置成功,密码为：a1234560，请尽快修改密码。",  personnelBusines.getAmosUnitOrgCode());
+
 
         if(data==null||data.getResult()==null){
             throw new BadRequest("修改状态失败！");
+        }else{
+            userMessageMapper.insert(userMessage);
+            emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
+        }
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new BadRequest("修改状态失败！");
+
         }
         return ResponseHelper.buildResponse(null);
     }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/QiyuesuoController.java

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -17,14 +18,21 @@ import com.qiyuesuo.sdk.v2.utils.Algorithm;
 import com.qiyuesuo.sdk.v2.utils.Base64Utils;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.CallbackDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.ContractDataDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
 import com.yeejoin.amos.boot.module.hygf.api.entity.SealDictionary;
+import com.yeejoin.amos.boot.module.hygf.api.entity.ToDoTasks;
+import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.SealDictionaryMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.ToDoTasksMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.UserMessageMapper;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ToDoTasksServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -32,6 +40,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -63,10 +72,20 @@ public class QiyuesuoController extends BaseController {
     QiyuesuoServiceImpl qiyuesuoService;
     @Autowired
     HouseholdContractServiceImpl householdContractServiceImpl;
-
+    @Autowired
+    HouseholdContractMapper householdContractMapper;
+    @Autowired
+    protected EmqKeeper emqKeeper;
+    @Autowired
+    UserMessageMapper userMessageMapper;
+    @Autowired
+    ToDoTasksMapper toDoTasksMapper;
     @Value("${qiyuesuo.secretKey}")
     private String secretKey;
-
+    @Autowired
+    ToDoTasksServiceImpl toDoTasksServiceImpl;
+    @Value("${dealer.engineering}")
+    private String engineering;
 
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(httpMethod = "post",value = "个人token",   notes = "个人token")
@@ -129,6 +148,13 @@ public class QiyuesuoController extends BaseController {
               wrapper.set(HouseholdContract::getStatus,HouseholdContractEnum.合同状态_农户已签署.getCode());
               wrapper.eq(HouseholdContract::getContractLockId,CallbackDto.getContractId());
               householdContractServiceImpl.update(wrapper);
+              LambdaQueryWrapper<HouseholdContract> wrapper4 = new LambdaQueryWrapper<>();
+
+              wrapper4.eq(HouseholdContract::getContractLockId,CallbackDto.getContractId());
+              HouseholdContract householdContrac= householdContractMapper.selectOne(wrapper4);
+              //生成填报任务
+              ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContrac.getSequenceNbr(),  "用户"+householdContrac.getPartyA()+"合同盖章",householdContrac.getDealerCode());
+              toDoTasksServiceImpl.addToDoTasksByRole(engineering,toDoTasks1,"发起合同成功");
 
           }else if("SEAL".equals(CallbackDto.getCallbackType())){
 
@@ -139,6 +165,29 @@ public class QiyuesuoController extends BaseController {
               wrapper.set(HouseholdContract::getSealedUser,getUserInfo().getRealName());
               wrapper.eq(HouseholdContract::getContractLockId,CallbackDto.getContractId());
               householdContractServiceImpl.update(wrapper);
+
+              LambdaQueryWrapper<HouseholdContract> wrapper4 = new LambdaQueryWrapper<>();
+
+              wrapper4.eq(HouseholdContract::getContractLockId,CallbackDto.getContractId());
+              HouseholdContract contract= householdContractMapper.selectOne(wrapper4);
+
+
+              LambdaQueryWrapper<ToDoTasks> wrapper1 = new LambdaQueryWrapper<>();
+              wrapper1.eq(ToDoTasks::getType, TaskTypeStationEnum.合同填报.getCode());
+              wrapper1.eq(ToDoTasks::getState, "待办");
+              wrapper1.eq(ToDoTasks::getBusinessId, contract.getSequenceNbr());
+              ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper1);
+              if(doTasks!=null){
+                  doTasks.setState("已办");
+                  doTasks.setCompleteTime(new Date());
+                  toDoTasksMapper.updateById(doTasks);
+                  emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false);
+
+                  UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成",  doTasks.getAmosOrgCode());
+                  userMessageMapper.insert(userMessage);
+                  emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
+
+              }
           }
 
         }catch (Exception e){

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/emqx/StationAuditMessageService.java

-package com.yeejoin.amos.boot.module.hygf.biz.emqx;
+package com.yeejoin.amos.boot.module.hygf.biz.x;
 
 
 import com.alibaba.fastjson.JSONObject;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/DealerReviewServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.Page;
@@ -25,6 +26,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -45,7 +47,8 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
     private static final String IDX_REQUEST_STATE = "200";
     @Autowired
     WorkflowFeignClient workflowFeignClient;
-
+    @Autowired
+    protected EmqKeeper emqKeeper;
     @Autowired
     AmosRequestContext requestContext;
     @Autowired
@@ -98,8 +101,12 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
                     doTasks.setState("已办");
                     doTasks.setCompleteTime(new Date());
                     toDoTasksMapper.updateById(doTasks);
+                    emqKeeper.getMqttClient().publish("TASK_MESSAGE" , JSON.toJSONString(doTasks).getBytes(), 2 ,false);
+
                     UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成."+meg,  doTasks.getAmosOrgCode());
                     userMessageMapper.insert(userMessage);
+                    emqKeeper.getMqttClient().publish("MY_MESSAGE" ,JSON.toJSONString(userMessage).getBytes(), 2 ,false);
+
                 }
             }
                 return fl;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java

@@ -5,12 +5,15 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PersonnelBusiness;
 import com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies;
 import com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo;
+import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.UnitInfoMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.UserMessageMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPersonnelBusinessService;
 import com.yeejoin.amos.boot.module.standard.api.entity.PublicAgencyUser;
 import com.yeejoin.amos.boot.module.standard.api.mapper.PublicAgencyUserMapper;
@@ -25,6 +28,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -46,11 +50,15 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
     PublicAgencyUserMapper publicAgencyUserMapper;
     @Autowired
     UnitInfoMapper unitInfoMapper;
+
+    @Autowired
+    UserMessageMapper userMessageMapper;
     @Value("${dealer.appcode}")
     private String appCodes;
     @Value("${amos.secret.key}")
     String secretKey;
-
+    @Autowired
+    protected EmqKeeper emqKeeper;
     @Value("${hygf.user.group.id}")
     private long userGroupId;
     /**
@@ -276,6 +284,8 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
 
     @Transactional
     public void replace(String id){
+        try {
+
         //获取当前用户
         LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
         qud.eq(PublicAgencyUser::getSequenceNbr,id);
@@ -316,6 +326,18 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
 
         //删除旧管理员
         Privilege.groupUserClient.deleteGroupUser(userGroupId,publicAgencyUsex.getAmosUserId());
+
+
+
+        UserMessage userMessage=  new UserMessage( TaskTypeStationEnum.设置管理员.getCode(), personnelBusines.getSequenceNbr() ,  publicAgencyUse.getAmosUserId(),  new Date(),   "您已成为单位管理员。",  personnelBusines.getAmosUnitOrgCode());
+
+        userMessageMapper.insert(userMessage);
+        emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
+
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new BadRequest("设置失败！");
+        }
     }
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -24,6 +25,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
@@ -69,6 +71,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     @Autowired
     ToDoTasksMapper toDoTasksMapper;
     @Autowired
+    protected EmqKeeper emqKeeper;
+    @Autowired
     ToDoTasksServiceImpl toDoTasksServiceImpl;
     @Autowired
     UserMessageMapper userMessageMapper;
@@ -129,13 +133,21 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
             PowerStationNodeEnum powerStationNodeEnum=   PowerStationNodeEnum.getNodeByCode(powerStation.getNextProcessNode());
 
             if (flag){
+
+                ToDoTasks toDoTasks=null;
+                if(PowerStationNodeEnum.经销商上传图纸.getCode().equals(powerStationNodeEnum.getCode())||PowerStationNodeEnum.经销商审核.getCode().equals(powerStationNodeEnum.getCode())){
                     //获取经销商orgcode
                     PeasantHousehold peasantHouseholdd=   peasantHouseholdService.getById(powerStation.getPeasantHouseholdId());
-                ToDoTasks toDoTasks=  new ToDoTasks (  TaskTypeStationEnum.电站审核.getCode(),  powerStation.getSequenceNbr(),   "用户"+name+"电站待"+powerStationNodeEnum.getName(),peasantHouseholdd.getDeveloperCode());
-
+                     toDoTasks=  new ToDoTasks (  TaskTypeStationEnum.电站审核.getCode(),  powerStation.getSequenceNbr(),   "用户"+name+"电站勘察待"+powerStationNodeEnum.getName(),peasantHouseholdd.getDeveloperCode());
+                    if(PowerStationNodeEnum.经销商审核.getCode().equals(powerStationNodeEnum.getCode())){
+                        toDoTasksServiceImpl.addToDoTasksByUserId(peasantHouseholdd.getDeveloperUserId(),toDoTasks,meg);
+                    }else{
                         toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(),toDoTasks,meg);
-
-
+                    }
+                }else{
+                    toDoTasks=  new ToDoTasks (  TaskTypeStationEnum.电站审核.getCode(),  powerStation.getSequenceNbr(),   "用户"+name+"电站勘察待"+powerStationNodeEnum.getName(),null);
+                    toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(),toDoTasks,meg);
+                }
             }else{
                 LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.电站审核.getCode());
@@ -147,8 +159,12 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
                     doTasks.setCompleteTime(new Date());
 
                     toDoTasksMapper.updateById(doTasks);
+                    emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false);
+
                     UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成."+meg,  doTasks.getAmosOrgCode());
                     userMessageMapper.insert(userMessage);
+                    emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
+
                 }
             }
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java

@@ -34,6 +34,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -88,7 +89,8 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
     UserMessageMapper userMessageMapper;
     @Value("${power.station.examine.pageId}")
     private long pageId;
-
+    @Autowired
+    protected EmqKeeper emqKeeper;
     @Value("${power.station.examine.planId}")
     private String planId;
 
@@ -114,6 +116,9 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
 
     @Transactional
     public SurveyInfoAllDto saveSurveyInfo(SurveyInfoAllDto surveyInfoAllDto,String operationType)   {
+        try {
+
+
         JSONArray regionName = getRegionName();
         List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
 
@@ -195,10 +200,6 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         }else if(OPERATION_TYPE_APPLY.equals(operationType)){
             // 提交审核
             submitExamine(peasantHousehold);
-        }
-        peasantHouseholdServiceImpl.saveOrUpdate(peasantHousehold);
-
-
             LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.电站勘察.getCode());
             wrapper.eq(ToDoTasks::getState, "待办");
@@ -208,11 +209,22 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
                 doTasks.setState("已办");
                 doTasks.setCompleteTime(new Date());
                 toDoTasksMapper.updateById(doTasks);
+                emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false);
+
                 UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成",  doTasks.getAmosOrgCode());
                 userMessageMapper.insert(userMessage);
+                emqKeeper.getMqttClient().publish("MY_MESSAGE" ,JSON.toJSONString(userMessage).getBytes(), 2 ,false);
+
+            }
         }
+        peasantHouseholdServiceImpl.saveOrUpdate(peasantHousehold);
+
 
 
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new RuntimeException("系统异常");
+        }
 
         return surveyInfoAllDto;
     }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/ToDoTasksServiceImpl.java

@@ -20,6 +20,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.HttpClientErrorException;
+import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -44,6 +47,9 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
     @Autowired
     UserMessageMapper userMessageMapper;
 
+    @Autowired
+    protected EmqKeeper emqKeeper;
+
     final static Logger log = LoggerFactory.getLogger(ToDoTasksServiceImpl.class);
 
     /**
@@ -77,7 +83,11 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
 
 
     @Override
+    @Transactional
     public void addToDoTasksByUserId(String userId, ToDoTasks toDoTasks,String meg) {
+        try {
+
+
         LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ToDoTasks::getType, toDoTasks.getType());
         wrapper.eq(ToDoTasks::getState, "待办");
@@ -87,14 +97,21 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
             doTasks.setState("已办");
             doTasks.setCompleteTime(new Date());
             toDoTasksMapper.updateById(doTasks);
+            emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false);
             UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成."+meg,  doTasks.getAmosOrgCode());
             userMessageMapper.insert(userMessage);
+            emqKeeper.getMqttClient().publish("MY_MESSAGE" ,JSON.toJSONString(userMessage).getBytes(), 2 ,false);
         }
 
         toDoTasks.setAmosUserId(userId);
         toDoTasksMapper.insert(toDoTasks);
+            emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(toDoTasks).getBytes(), 2 ,false);
         UserMessage userMessage=  new UserMessage( toDoTasks.getType(),  toDoTasks.getBusinessId(),  toDoTasks.getAmosUserId(),  new Date(),  toDoTasks.getTaskName()+"待完成",  toDoTasks.getAmosOrgCode());
         userMessageMapper.insert(userMessage);
+            emqKeeper.getMqttClient().publish("MY_MESSAGE" ,JSON.toJSONString(userMessage).getBytes(), 2 ,false);
+        }catch (Exception e){
+            throw  new RuntimeException("任务添加失败！");
+        }
     }
 
     @Override
@@ -113,14 +130,19 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
                 doTasks.setState("已办");
                 doTasks.setCompleteTime(new Date());
                 toDoTasksMapper.updateById(doTasks);
+                emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false);
+
                 UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成."+meg,  doTasks.getAmosOrgCode());
                 userMessageMapper.insert(userMessage);
+                emqKeeper.getMqttClient().publish("MY_MESSAGE" ,JSON.toJSONString(userMessage).getBytes(), 2 ,false);
+
 
             }
 
             synchronized (this) {
                 if (redisUtils.hasKey("TAKS_" + role)) {
                     String id = redisUtils.get("TAKS_" + role).toString();
+                    System.out.println(role+"角色人员"+id);
                     List<TasksRole> listd = toDoTasksMapper.getTasksRole(role,toDoTasks.getAmosOrgCode());
 
                     if (listd != null && !listd.isEmpty()) {
@@ -139,6 +161,7 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
                             redisUtils.set("TAKS_" + role, idList.get(0));
                         }
                     }else {
+                        System.out.println(role+"没有此角色人员");
                         log.info("没有此角色人员！");
                     }
 
@@ -151,14 +174,17 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
                         redisUtils.set("TAKS_" + role, idList.get(0));
 
                     }  else {
-
+                        System.out.println(role+"没有此角色人员");
                         log.info("没有此角色人员！");
                     }
 
                 }
                 toDoTasksMapper.insert(toDoTasks);
+                emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(toDoTasks).getBytes(), 2 ,false);
+
                 UserMessage userMessage=  new UserMessage( toDoTasks.getType(),  toDoTasks.getBusinessId(),  toDoTasks.getAmosUserId(),  new Date(),  toDoTasks.getTaskName()+"待完成",  toDoTasks.getAmosOrgCode());
                 userMessageMapper.insert(userMessage);
+                emqKeeper.getMqttClient().publish("MY_MESSAGE" ,JSON.toJSONString(userMessage).getBytes(), 2 ,false);
 
             }
             }catch(Exception e){

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/TreeDto.java

@@ -34,6 +34,11 @@ public class TreeDto {
     private Integer isOnClick;
 
     /**
+     * 风机首页-配置页面场景ID
+     */
+    private String sceneId;
+
+    /**
      * 子节点
      */
     private List<TreeDto> children;

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -160,7 +160,8 @@
             sequence_nbr as code,
             station_type as parentCode,
             sequence_nbr as id,
-            '1' as isOnclick
+            '1' as isOnclick,
+            scene_id as sceneId
         from station_basic
         <where>
             <if test="regionCode != null and regionCode != ''">

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/constants/CommonConstans.java

@@ -17,8 +17,8 @@ public class CommonConstans {
 //    发电量完成率=（月/年）发电量/（月/年）发电量指标
 //    小时数完成率=（月/年）可利用小时/（月/年）可利用小时数指标
 //    可利用小时(h)=（日/月/年）发电量（万kW·h）/装机容量（万kW）
-//    二氧化碳减排量（万t）=发电量（万kW·h）*0.79
-    public static final Double carbonDioxide = 0.79;
+//    二氧化碳减排量（万t）=发电量（万kW·h）*0.997 * 10 / 10000
+    public static final Double carbonDioxide = 0.997 * 10 / 10000;
     //    节约标准煤（万t）=发电量（万kW·h）*0.29
     public static final Double standardCoal = 0.29;
     //    炭粉尘减排量（t）=发电量（万kW·h）*0.30
@@ -75,4 +75,19 @@ public class CommonConstans {
         }
 
     };
+    //es EquipIndexName 查绚关键字
+    public static final String QueryStringEquipmentIndexName = "equipmentIndexName.keyword";
+    //es gatewayId 查绚关键字
+    public static final String QueryStringGateWayId = "gatewayId.keyword";
+    public static final String QueryStringFrontMoudle = "frontModule.keyword";
+    public static final String QueryStringSystemType = "systemType";
+    public static final String QueryStringEquipmentNumber = "equipmentNumber";
+    public static final String QueryStringValue = "value";
+    public static final String QueryStringValueKeyword = "value.keyword";
+    public static final String QueryStringDataType = "dataType";
+    public static final String QueryStringDisplayName = "displayName";
+    public static final String QueryStringIsAlarm = "isAlarm";
+    public static final String Twodecimalplaces= "%.2f";
+    public static final String Fourdecimalplaces = "%.4f";
+    public static final String QueryStringFrontMoudleNotKeyWord = "frontModule";
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -241,7 +241,7 @@ public class MonitorFanIdxController extends BaseController {
         }
 
         String num = monitorFanIndicator.getFJCount(gatewayId);
-        columnMap.put("风机台数",num);
+        columnMap.put("风机台数",Double.valueOf(num).intValue());
 
         Double capacityl = commonServiceImpl.getStationCapactityByStationWerks(stationBasic.getStationNumber());
         columnMap.put("装机容量",String.format("%.2f",capacityl));
@@ -255,17 +255,18 @@ public class MonitorFanIdxController extends BaseController {
         List<Map>  list = parseArray(json, Map.class);
         for (Map map : list) {
             String key = map.get("title").toString();
+            map.put("title", columnMap.get(key)==null?0.00:columnMap.get(key));
+            map.put("title2",map.get("title"));
             if (map.containsKey("action")){
                 if (key.equals("日利用小时")){
-                    map.put("title", map.get("action").toString().replace("*","日发电量").replace("-","装机容量"));
+                    String format = String.format("%.2f", ((Double.parseDouble(columnMap.get("日发电量").toString())*10)/ (Double.parseDouble(columnMap.get("装机容量").toString()))));
+                    map.put("title", format);
                     map.put("title2",map.get("title"));
                 }else {
-                    map.put("title", map.get("action").toString().replace("*",columnMap.get(key).toString()));
+                    map.put("title",String.format("%.2f",Double.parseDouble(columnMap.get(key).toString())/1000));
                     map.put("title2",map.get("title"));
                 }
             }
-            map.put("title", columnMap.get(key)==null?0.00:columnMap.get(key));
-            map.put("title2",map.get("title"));
 
         }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -30,6 +30,7 @@ import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+import org.springframework.data.elasticsearch.core.SearchHit;
 import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.Query;
@@ -281,6 +282,47 @@ public class CommonServiceImpl {
         return listdata;
     }
 
+    public Double getSumByEquipmentIndxName(List<ESEquipments> equipments, String indexName) {
+        Double result = 0.00;
+        result = equipments.stream().filter(esEquipments -> esEquipments.getEquipmentIndexName().equals(indexName)).mapToDouble(ESEquipments::getValueDouble).sum();
+        return result;
+    }
+
+    /**
+     * 根据查询条件获取列表信息
+     *
+     * @param mustQuerCondtion
+     * @param shouldQuerCondtion
+     * @param tClass
+     * @param <T>
+     * @return
+     */
+    public <T> List<T> getListDataByCondtions(Map<String, List<String>> mustQuerCondtion, Map<String, String> shouldQuerCondtion, Class<T> tClass) {
+        BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
+        if (!ObjectUtils.isEmpty(mustQuerCondtion)) {
+            for (String key : mustQuerCondtion.keySet()) {
+                List<String> va = mustQuerCondtion.get(key);
+                queryBuilder.must(QueryBuilders.termsQuery(key, va));
+            }
+        }
+        if (!ObjectUtils.isEmpty(shouldQuerCondtion)) {
+            for (String key : shouldQuerCondtion.keySet()) {
+                queryBuilder.should(QueryBuilders.wildcardQuery(key, shouldQuerCondtion.get(key)));
+            }
+        }
+        Query query = new NativeSearchQueryBuilder()
+                .withQuery(queryBuilder)
+                .build();
+        query.setTrackTotalHits(true);
+        SearchHits search = elasticsearchTemplate.search(query, tClass);
+        if (search.hasSearchHits()) {
+            List<SearchHit<T>> searchHitList = search.getSearchHits();
+            List<T> list = searchHitList.stream().map(hit -> hit.getContent()).collect(Collectors.toList());
+            return list;
+        }
+        return null;
+    }
+
 
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/json/fanlocation.json

+[
+  {
+    "euqipmentNumber": "01",
+    "latitude": "26°19'20.3968",
+    "longitude": "114°43'01.3487"
+  },
+  {
+    "euqipmentNumber": "02",
+    "latitude": "26°18'17.3192",
+    "longitude": "114°43'55.0756"
+  },
+  {
+    "euqipmentNumber": "03",
+    "latitude": "26°18'34.3219",
+    "longitude": "114°44'01.4686"
+  },
+  {
+    "euqipmentNumber": "04",
+    "latitude": "26°18'42.2673",
+    "longitude": "114°44'10.7522"
+  },
+  {
+    "euqipmentNumber": "05",
+    "latitude": "26°18'38.0098",
+    "longitude": "114°44'21.7018"
+  },
+  {
+    "euqipmentNumber": "06",
+    "latitude": "26°18'34.6466",
+    "longitude": "114°44'29.9556"
+  },
+  {
+    "euqipmentNumber": "07",
+    "latitude": "26°18'36.8995",
+    "longitude": "114°44'39.7470"
+  },
+  {
+    "euqipmentNumber": "08",
+    "latitude": "26°18'33.5051",
+    "longitude": "114°44'50.8102"
+  },
+  {
+    "euqipmentNumber": "09",
+    "longitude": "114°42'38.4597",
+    "latitude": "26°16'45.3175"
+  },
+  {
+    "euqipmentNumber": "10",
+    "longitude": "114°42'46.7892",
+    "latitude": "26°16'34.2193"
+  },
+  {
+    "euqipmentNumber": "11",
+    "longitude": "114°42'57.3524",
+    "latitude": "26°16'18.2295"
+  },
+  {
+    "euqipmentNumber": "12",
+    "longitude": "114°43'44.6453",
+    "latitude": "26°16'22.9530"
+  },
+  {
+    "euqipmentNumber": "13",
+    "latitude": "26°16'25.2473",
+    "longitude": "114°43'55.4240"
+  },
+  {
+    "euqipmentNumber": "14",
+    "latitude": "26°15'23.8288",
+    "longitude": "114°42'46.1713"
+  },
+  {
+    "euqipmentNumber": "15",
+    "latitude": "26°15'18.3501",
+    "longitude": "114°42'36.4494"
+  },
+  {
+    "euqipmentNumber": "16",
+    "latitude": "26°15'15.1157",
+    "longitude": "114°42'24.2207"
+  },
+  {
+    "euqipmentNumber": "17",
+    "latitude": "26°15'12.3541",
+    "longitude": "114°42'16.2315"
+  },
+  {
+    "euqipmentNumber": "18",
+    "latitude": "26°15'07.7590",
+    "longitude": "114°42'09.1002"
+  },
+  {
+    "euqipmentNumber": "19",
+    "latitude": "26°15'06.4482",
+    "longitude": "114°41'59.3730"
+  },
+  {
+    "euqipmentNumber": "20",
+    "latitude": "26°15'05.7242",
+    "longitude": "114°41'51.2436"
+  },
+  {
+    "euqipmentNumber": "21",
+    "latitude": "26°14'54.2353",
+    "longitude": "114°41'45.1572"
+  },
+  {
+    "euqipmentNumber": "22",
+    "latitude": "26°14'53.7742",
+    "longitude": "114°41'35.6931"
+  },
+  {
+    "euqipmentNumber": "23",
+    "latitude": "26°14'49.6670",
+    "longitude": "114°41'28.9852"
+  },
+  {
+    "euqipmentNumber": "24",
+    "latitude": "26°14'52.6637",
+    "longitude": "114°41'19.3269"
+  },
+  {
+    "euqipmentNumber": "25",
+    "latitude": "26°14'43.4608",
+    "longitude": "114°41'12.0974"
+  },
+  {
+    "euqipmentNumber": "26",
+    "latitude": "26°14'40.3649",
+    "longitude": "114°41'03.8101"
+  },
+  {
+    "euqipmentNumber": "27",
+    "latitude": "26°15'33.5730",
+    "longitude": "114°40'33.7931"
+  },
+  {
+    "euqipmentNumber": "28",
+    "latitude": "26°15'24.1330",
+    "longitude": "114°40'51.2196"
+  },
+  {
+    "euqipmentNumber": "29",
+    "latitude": "26°15'29.4603",
+    "longitude": "114°40'45.3326"
+  }
+]
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PrivilegeController.java

@@ -86,8 +86,10 @@ public class PrivilegeController extends BaseController{
         CompanyModel  companyModel=dat.getResult();
         List<CompanyModel> list =new ArrayList<>();
         //如果是公司则获取所有片区
-        if(companyModel.getLevel().equals("headquarter")){
+//        86*353*328*364
+        if(companyModel.getLevel().equals("categroy_leve2")){
             Collection<CompanyModel> companyModelList= de.getResult();
+            companyModelList=companyModelList.stream().filter(companyModel1 ->companyModel1.getCompanyName().contains("区域")).collect(Collectors.toList());
             companyModelList.parallelStream().forEach((companyModel1)->{companyModel1.setChildren(new ArrayList());});
             return ResponseHelper.buildResponse(companyModelList);
         }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/constants/CommonConstans.java

@@ -79,16 +79,23 @@ public class CommonConstans {
     };
     //es EquipIndexName 查绚关键字
     public static final String QueryStringEquipmentIndexName = "equipmentIndexName.keyword";
+    //es EquipIndexName 查绚关键字
+    public static final String QueryStringEquipmentIndexNameNotKeyword = "equipmentIndexName";
     //es gatewayId 查绚关键字
     public static final String QueryStringGateWayId = "gatewayId.keyword";
     public static final String QueryStringFrontMoudle = "frontModule.keyword";
     public static final String QueryStringSystemType = "systemType";
+    public static final String QueryStringSystemTypeKeyword = "systemType.keyword";
     public static final String QueryStringEquipmentNumber = "equipmentNumber";
+    public static final String QueryStringEquipmentNumberKeyword = "equipmentNumber.keyword";
     public static final String QueryStringValue = "value";
     public static final String QueryStringValueKeyword = "value.keyword";
     public static final String QueryStringDataType = "dataType";
     public static final String QueryStringDisplayName = "displayName";
+    public static final String QueryStringDisplayNameKeyword = "displayName.keyword";
     public static final String QueryStringIsAlarm = "isAlarm";
+    public static final String QueryStringIsAlarmKeyword = "isAlarm.keyword";
     public static final String  Twodecimalplaces= "%.2f";
     public static final String Fourdecimalplaces = "%.4f";
+    public static final String QueryStringFrontMoudleNotKeyWord = "frontModule";
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -763,6 +763,7 @@ public class MonitorFanIdxController extends BaseController {
 
         List<Map<String, Object>> statusMonitoring = monitorFanIndicator.solarPowerOperation(gatewayId);
         List<Map<String, Object>> collect = statusMonitoring.stream()
+                .sorted(Comparator.comparing(t -> Integer.parseInt(t.get("sort").toString())))
                 .skip((long) (current - 1) * size)
                 .limit(size)
                 .collect(Collectors.toList());
@@ -822,4 +823,18 @@ public class MonitorFanIdxController extends BaseController {
         Page<Map<String, Object>> result = monitorFanIndicator.nbqStatus(stationBasic.getFanGatewayId());
         return ResponseHelper.buildResponse(result);
     }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "实时告警")
+    @GetMapping("/getEventByEquipIndex")
+    public ResponseModel<ResultsData> getEventByEquipIndex(@RequestParam(value = "current") int current,
+                                                           @RequestParam(value = "size") int size,
+                                                           @RequestParam(value = "stationId") String stationId,
+                                                           @RequestParam(value = "equipIndex") String equipIndex,
+                                                           @RequestParam(value = "frontModule") String frontModule) {
+        StationBasic stationBasic = stationBasicMapper.selectById(stationId);
+        String gatewayId = stationBasic.getFanGatewayId();
+        ResultsData resultsData = equipAlarmEventService.getEventByEquipIndex(gatewayId, current, size, equipIndex, frontModule);
+        return ResponseHelper.buildResponse(resultsData);
+    }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -464,7 +464,6 @@ public class CommonServiceImpl {
                 queryBuilder.should(QueryBuilders.wildcardQuery(key, shouldQuerCondtion.get(key)));
             }
         }
-
         Query query = new NativeSearchQueryBuilder()
                 .withQuery(queryBuilder)
                 .build();
@@ -479,6 +478,7 @@ public class CommonServiceImpl {
     }
 
 
+
     /**
      * 根据查询条件获取列表信息
      *
@@ -486,7 +486,7 @@ public class CommonServiceImpl {
      * @param shouldQuerCondtion
      * @param tClass
      * @param <T>
-     * @param likeMap 模糊字段查询
+     * @param likeMap 模糊字段查询 key：不能带.keyWords
      * @return
      */
     public <T> List<T> getListDataByCondtionsAndLike(Map<String, List<String>> mustQuerCondtion, Map<String, String> shouldQuerCondtion, Class<T> tClass, Map<String, String> likeMap) {
@@ -519,7 +519,7 @@ public class CommonServiceImpl {
             List<T> list = searchHitList.stream().map(hit -> hit.getContent()).collect(Collectors.toList());
             return list;
         }
-        return null;
+        return new ArrayList<>();
     }
 
 
@@ -566,4 +566,36 @@ public class CommonServiceImpl {
         result = equipments.stream().filter(esEquipments -> esEquipments.getEquipmentIndexName().equals(indexName)).mapToDouble(ESEquipments::getValueDouble).sum();
         return result;
     }
+
+    public <T> List<T> getListDataByCondtions(Map<String, List<String>> mustQuerCondtion, Map<String, String> shouldQuerCondtion, Class<T> tClass,Map<String, String> likeQuerCondtion) {
+        BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
+        if (!ObjectUtils.isEmpty(mustQuerCondtion)) {
+            for (String key : mustQuerCondtion.keySet()) {
+                List<String> va = mustQuerCondtion.get(key);
+                queryBuilder.must(QueryBuilders.termsQuery(key, va));
+            }
+        }
+        if (!ObjectUtils.isEmpty(shouldQuerCondtion)) {
+            for (String key : shouldQuerCondtion.keySet()) {
+                queryBuilder.should(QueryBuilders.wildcardQuery(key, shouldQuerCondtion.get(key)));
+            }
+        }
+
+        if (!ObjectUtils.isEmpty(likeQuerCondtion)) {
+            for (String key : likeQuerCondtion.keySet()) {
+                queryBuilder.must(QueryBuilders.wildcardQuery(key, "*"+likeQuerCondtion.get(key)+"*"));
+            }
+        }
+        Query query = new NativeSearchQueryBuilder()
+                .withQuery(queryBuilder)
+                .build();
+        query.setTrackTotalHits(true);
+        SearchHits search = elasticsearchTemplate.search(query, tClass);
+        if (search.hasSearchHits()) {
+            List<SearchHit<T>> searchHitList = search.getSearchHits();
+            List<T> list = searchHitList.stream().map(hit -> hit.getContent()).collect(Collectors.toList());
+            return list;
+        }
+        return null;
+    }
 }