Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.entity.ToDoTasks;
+import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/21
+ */
+@Data
+public class UserMessagePageDto extends Page<UserMessage> {
+
+
+
+    /**
+     * 任务类型
+     */
+    private String type;
+
+
+    /**
+     * 用户id
+     */
+    private String amosUserId;
+
+    /**
+     *  消息创建时间
+     */
+    private Date creationTime;
+
+    /**
+     * 消息内容
+     */
+    private String taskName;
+
+
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DealerReview.java

@@ -75,4 +75,6 @@ public class DealerReview extends BaseEntity {
     @TableField("plan_instance_id")
     private String planInstanceId;
 
+
+
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/UserMessage.java

@@ -58,4 +58,16 @@ public class UserMessage extends BaseEntity {
 	@TableField("amos_org_code")
     private String amosOrgCode;
 
+
+    public UserMessage(String type, Long businessId, String amosUserId, Date creationTime, String taskName, String amosOrgCode) {
+        this.type = type;
+        this.businessId = businessId;
+        this.amosUserId = amosUserId;
+        this.creationTime = creationTime;
+        this.taskName = taskName;
+        this.amosOrgCode = amosOrgCode;
+    }
+
+    public UserMessage() {
+    }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IDealerReviewService.java

@@ -16,5 +16,5 @@ public interface IDealerReviewService {
 
     public  com.baomidou.mybatisplus.extension.plugins.pagination.Page<ReviewDto> queryForDealerReviewPage(int pageNum, int pageSize, ReviewDto reviewDto);
 
-    boolean saveDealerReview(DealerReview dealerReview, boolean flag, boolean token);
+    boolean saveDealerReview(DealerReview dealerReview, boolean flag, boolean token,String name);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IPowerStationService.java

@@ -19,7 +19,7 @@ public interface IPowerStationService {
      * @param flag 是否是最后一个节点
      * @return 状态
      */
-    boolean savePowerStation(PowerStation powerStation, boolean flag);
+    boolean savePowerStation(PowerStation powerStation, boolean flag,String name);
 
 
     /**

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

@@ -9,9 +9,11 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 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.PersonnelBusinessMapper;
 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.PeasantHouseholdServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ToDoTasksServiceImpl;
@@ -73,6 +75,8 @@ public class HouseholdContractController extends BaseController {
     PersonnelBusinessMapper personnelBusinessMapper;
     @Autowired
     ToDoTasksMapper toDoTasksMapper;
+    @Autowired
+    UserMessageMapper userMessageMapper;
     /**
      * 新增
      *
@@ -191,7 +195,7 @@ public class HouseholdContractController extends BaseController {
         householdContrac.setStatus(HouseholdContractEnum.合同状态_农户已签署.getCode());
 
         //生成填报任务
-        ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContrac.getSequenceNbr(),   TaskTypeStationEnum.合同填报.getCode(),householdContrac.getDealerCode());
+        ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContrac.getSequenceNbr(),  "用户"+householdContrac.getPartyA()+"合同盖章",householdContrac.getDealerCode());
         toDoTasksServiceImpl.addToDoTasksByRole(engineering,toDoTasks1);
 
 
@@ -224,21 +228,12 @@ public class HouseholdContractController extends BaseController {
             doTasks.setState("已办");
             doTasks.setCompleteTime(new Date());
             toDoTasksMapper.updateById(doTasks);
+            UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成",  doTasks.getAmosOrgCode());
+            userMessageMapper.insert(userMessage);
         }
-
         return householdContractServiceImpl.updateById(householdContrac);
-
-
     }
 
-
-
-
-
-
-
-
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/cancel/{sequenceNbr}")
     @ApiOperation(httpMethod = "Post", value = "作废", notes = "作废")
@@ -260,6 +255,8 @@ public class HouseholdContractController extends BaseController {
         if(doTasks!=null){
             doTasks.setState("作废");
             toDoTasksMapper.updateById(doTasks);
+            UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已作废",  doTasks.getAmosOrgCode());
+            userMessageMapper.insert(userMessage);
         }
         return householdContractServiceImpl.updateById(householdContrac);
 

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.hygf.api.dto.ToDoTasksPageDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
 import com.yeejoin.amos.boot.module.hygf.api.entity.ToDoTasks;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.ToDoTasksMapper;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ToDoTasksServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -34,7 +40,8 @@ public class ToDoTasksController extends BaseController {
 
     @Autowired
     ToDoTasksServiceImpl toDoTasksServiceImpl;
-
+    @Autowired
+    ToDoTasksMapper toDoTasksMapper;
     /**
      * 新增人员任务
      *
@@ -119,4 +126,26 @@ public class ToDoTasksController extends BaseController {
 	public ResponseModel<List<ToDoTasksDto>> selectForList() {
 	    return ResponseHelper.buildResponse(toDoTasksServiceImpl.queryForToDoTasksList());
 	}
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/count")
+    @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个人员任务",  notes = "根据sequenceNbr查询单个人员任务")
+    public ResponseModel<Map<String,Object>> count() {
+        String userid=getUserInfo().getUserId();
+        LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ToDoTasks::getAmosUserId, userid);
+        wrapper.eq(ToDoTasks::getState, "待办");
+        Integer DB= toDoTasksMapper.selectCount(wrapper);
+        LambdaQueryWrapper<ToDoTasks> wrapper1 = new LambdaQueryWrapper<>();
+        wrapper1.eq(ToDoTasks::getAmosUserId, userid);
+        wrapper1.eq(ToDoTasks::getState, "已办");
+        Integer YB= toDoTasksMapper.selectCount(wrapper1);
+        Map<String,Object> map =new HashMap<>();
+        map.put("DB",DB==null?0:DB);
+        map.put("YB",YB==null?0:YB);
+        return ResponseHelper.buildResponse(map);
+    }
+
+
 }

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.dto.ToDoTasksPageDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.UserMessagePageDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.ToDoTasks;
+import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -84,23 +89,14 @@ public class UserMessageController extends BaseController {
 	    return ResponseHelper.buildResponse(userMessageServiceImpl.queryBySeq(sequenceNbr));
 	}
 
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "人员消息分页查询",  notes = "人员消息分页查询")
-	public ResponseModel<Page<UserMessageDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<UserMessageDto> page = new Page<UserMessageDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(userMessageServiceImpl.queryForUserMessagePage(page));
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET",value = "人员任务分页查询",  notes = "人员任务分页查询")
+    public ResponseModel<IPage<UserMessage>> queryForPage(UserMessagePageDto userMessagePageDto) {
+
+        userMessagePageDto.setAmosUserId(getUserInfo().getUserId());
+        return ResponseHelper.buildResponse(userMessageServiceImpl.queryUserMessagePageDto(userMessagePageDto));
+    }
 
 	/**
 	 * 列表全部数据查询
@@ -113,4 +109,7 @@ public class UserMessageController extends BaseController {
 	public ResponseModel<List<UserMessageDto>> selectForList() {
 	    return ResponseHelper.buildResponse(userMessageServiceImpl.queryForUserMessageList());
 	}
+
+
+
 }

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

@@ -13,8 +13,10 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.UnitInfoDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.DealerReview;
 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.DealerReviewMapper;
 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.api.service.IDealerReviewService;
 import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -55,7 +57,8 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
     private String AMOS_STUDIO_WEB;
     @Value("${amos.system.user.app-key}")
     private String AMOS_STUDIO;
-
+    @Autowired
+    UserMessageMapper userMessageMapper;
 
     @Override
     public com.baomidou.mybatisplus.extension.plugins.pagination.Page<ReviewDto> queryForDealerReviewPage(int pageNum, int pageSize, ReviewDto reviewDto) {
@@ -71,7 +74,7 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
     }
 
     @Override
-    public boolean saveDealerReview(DealerReview dealerReview, boolean flag, boolean token) {
+    public boolean saveDealerReview(DealerReview dealerReview, boolean flag, boolean token,String name) {
         try {
             //流程节点code
             if (flag) {
@@ -83,7 +86,7 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
             }
             boolean fl = this.saveOrUpdate(dealerReview);
             if (flag) {
-                ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.经销商审核.getCode(), dealerReview.getSequenceNbr(), TaskTypeStationEnum.经销商审核.getCode(),null);
+                ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.经销商审核.getCode(), dealerReview.getSequenceNbr(), "经销商"+name+"审核",null);
                 toDoTasksServiceImpl.addToDoTasksByRole(dealerReview.getNodeRole(), toDoTasks);
             }else{
                 LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
@@ -95,6 +98,8 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
                     doTasks.setState("已办");
                     doTasks.setCompleteTime(new Date());
                     toDoTasksMapper.updateById(doTasks);
+                    UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成",  doTasks.getAmosOrgCode());
+                    userMessageMapper.insert(userMessage);
                 }
             }
                 return fl;

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

@@ -190,7 +190,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         householdContractMapper.updateById(householdContract);
         //创建农户待办
 
-        ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContract.getSequenceNbr(),   TaskTypeStationEnum.合同填报.getCode(),householdContract.getDealerCode());
+        ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContract.getSequenceNbr(),   "用户"+householdContract.getPartyA()+"的合同填写",householdContract.getDealerCode());
         PeasantHousehold peasantHousehold=peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
         toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getAmosUserId(),toDoTasks1);
         return householdContract;
@@ -296,7 +296,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         householdContractMapper.updateById(householdContract);
 
          //生成填报任务
-         ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContract.getSequenceNbr(),   TaskTypeStationEnum.合同填报.getCode(),householdContract.getDealerCode());
+         ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContract.getSequenceNbr(),   "用户"+householdContract.getPartyA()+"的合同填写",householdContract.getDealerCode());
          PeasantHousehold peasan=peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
          toDoTasksServiceImpl.addToDoTasksByUserId(peasan.getAmosUserId(),toDoTasks1);
 

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

@@ -194,10 +194,10 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         householdContractServiceImpl.addHouseholdContract(householdContract);
 
         //生成待办任务
-        ToDoTasks toDoTasks=  new ToDoTasks (  TaskTypeStationEnum.电站勘察.getCode(),  peasantHousehold.getSequenceNbr(),   TaskTypeStationEnum.电站勘察.getCode(),householdContract.getDealerCode());
+        ToDoTasks toDoTasks=  new ToDoTasks (  TaskTypeStationEnum.电站勘察.getCode(),  peasantHousehold.getSequenceNbr(),   "用户"+householdContract.getPartyA()+"电站信息勘察",householdContract.getDealerCode());
         toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getDeveloperUserId(),toDoTasks);
 
-        ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContract.getSequenceNbr(),   TaskTypeStationEnum.合同填报.getCode(),householdContract.getDealerCode());
+        ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContract.getSequenceNbr(),  "用户"+householdContract.getPartyA()+"的合同待发起",householdContract.getDealerCode());
         toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getDeveloperUserId(),toDoTasks1);
 
         return model;

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

@@ -99,13 +99,13 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
             roleSeqMap.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userDataZHDto.getRole());
             orgRoles.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userRoleList);
-            agencyUserModel.setAppCodes(split);
+           // agencyUserModel.setAppCodes(split);
             agencyUserModel.setOrgRoles(orgRoles);
             agencyUserModel.setOrgRoleSeqs(roleSeqMap);
             // 将创建用户加入用户组
              userResult = Privilege.agencyUserClient.create(agencyUserModel);
-            if (userResult == null || userResult.getResult() == null) {
-                throw new BadRequest("新增人员失败！");
+            if (userResult == null || userResult.getStatus()!=200) {
+                throw new BadRequest("新增人员失败！"+userResult.getDevMessage());
             }
             List<String> userId = new ArrayList<>();
             userId.add(userResult.getResult().getUserId());
@@ -124,8 +124,8 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             publicAgencyUser.setAmosId(userDataJBDto.getAmosUnitId());
 
             FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(userDataJBDto.getAmosUnitId());
-            if (companyResult == null || companyResult.getResult() == null) {
-                throw new BadRequest("新增人员失败");
+            if (companyResult == null || companyResult.getStatus()!=200) {
+                throw new BadRequest("新增人员失败！"+companyResult.getDevMessage());
             }
             publicAgencyUser.setAmosOrgCode(companyResult.getResult().getOrgCode());
             publicAgencyUser.setAmosUserId(userResult.getResult().getUserId());
@@ -146,8 +146,8 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
 
             PersonnelBusiness re=new PersonnelBusiness();
             FeignClientResult<CompanyModel> companyResult1 = Privilege.companyClient.seleteOne(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
-            if (companyResult1 == null || companyResult1.getResult() == null) {
-                throw new BadRequest("新增人员失败");
+            if (companyResult1 == null || companyResult1.getStatus()!=200) {
+                throw new BadRequest("新增人员失败！"+companyResult1.getDevMessage());
             }
             re.setRegionalCompaniesSeq(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
             re.setRegionalCompaniesName(companyResult1.getResult().getCompanyName());
@@ -198,13 +198,13 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
             roleSeqMap.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userDataZHDto.getRole());
             orgRoles.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userRoleList);
-            agencyUserModel.setAppCodes(split);
+            //agencyUserModel.setAppCodes(split);
             agencyUserModel.setOrgRoles(orgRoles);
             agencyUserModel.setOrgRoleSeqs(roleSeqMap);
             // 将创建用户加入用户组
             userResult = Privilege.agencyUserClient.update(agencyUserModel,publicAgencyUser.getAmosUserId());
-            if (userResult == null || userResult.getResult() == null) {
-                throw new BadRequest("修改人员失败！");
+            if (userResult == null || userResult.getStatus()!=200) {
+                throw new BadRequest("修改人员失败！"+userResult.getDevMessage());
             }
             List<String> userId = new ArrayList<>();
             userId.add(userResult.getResult().getUserId());
@@ -222,8 +222,8 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             publicAgencyUser.setAmosId(userDataJBDto.getAmosUnitId());
 
             FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(userDataJBDto.getAmosUnitId());
-            if (companyResult == null || companyResult.getResult() == null) {
-                throw new BadRequest("修改人员失败");
+            if (companyResult == null || companyResult.getStatus()!=200) {
+                throw new BadRequest("修改人员失败！"+companyResult.getDevMessage());
             }
             publicAgencyUser.setAmosOrgCode(companyResult.getResult().getOrgCode());
             publicAgencyUser.setAmosUserName(userDataZHDto.getUserName());
@@ -247,8 +247,8 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             PersonnelBusiness re=personnelBusinessMapper.selectOne(qug);
 
             FeignClientResult<CompanyModel> companyResult1 = Privilege.companyClient.seleteOne(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
-            if (companyResult1 == null || companyResult1.getResult() == null) {
-                throw new BadRequest("修改人员失败");
+            if (companyResult1 == null || companyResult1.getStatus()!=200) {
+                throw new BadRequest("修改人员失败！"+companyResult1.getDevMessage());
             }
             re.setRegionalCompaniesSeq(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
             re.setRegionalCompaniesName(companyResult1.getResult().getCompanyName());
@@ -302,7 +302,9 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
         unitInfo.setAdminLoginName(publicAgencyUse.getAmosUserName());
         unitInfo.setAdminPhone(publicAgencyUse.getEmergencyTelephone());
         unitInfo.setAdminUserId(publicAgencyUse.getAmosUserId());
-        unitInfo.setAdminUserName(publicAgencyUse.getRecUserName());
+        unitInfo.setAdminUserName(publicAgencyUse.getRealName());
+
+
         unitInfoMapper.updateById(unitInfo);
 
         List<String> userId = new ArrayList<>();

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

@@ -69,7 +69,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     ToDoTasksMapper toDoTasksMapper;
     @Autowired
     ToDoTasksServiceImpl toDoTasksServiceImpl;
-
+    @Autowired
+    UserMessageMapper userMessageMapper;
     public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode, String ownersName, AgencyUserModel userInfo){
         String serviceAgent =null;
 //        Map<Long, List<RoleModel>> orgRoles = userInfo.getOrgRoles();
@@ -112,7 +113,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 
     @Override
     @Transactional
-    public boolean savePowerStation(PowerStation powerStation, boolean flag) {
+    public boolean savePowerStation(PowerStation powerStation, boolean flag,String name) {
         try{
             //流程节点code
             if (flag) {
@@ -128,7 +129,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
                 //获取经销商orgcode
                 PeasantHousehold peasantHouseholdd=   peasantHouseholdService.getById(powerStation.getPeasantHouseholdId());
 
-                ToDoTasks toDoTasks=  new ToDoTasks (  TaskTypeStationEnum.电站审核.getCode(),  powerStation.getSequenceNbr(),   TaskTypeStationEnum.电站审核.getCode(),peasantHouseholdd.getDeveloperCode());
+                ToDoTasks toDoTasks=  new ToDoTasks (  TaskTypeStationEnum.电站审核.getCode(),  powerStation.getSequenceNbr(),   "用户"+name+"电站审核",peasantHouseholdd.getDeveloperCode());
                 toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(),toDoTasks);
 
             }else{
@@ -142,6 +143,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
                     doTasks.setCompleteTime(new Date());
 
                     toDoTasksMapper.updateById(doTasks);
+                    UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成",  doTasks.getAmosOrgCode());
+                    userMessageMapper.insert(userMessage);
                 }
             }
 
@@ -219,7 +222,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
                     String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
                     powerStation.setFlowTaskId(flowTaskId);
                 }
-                powerStationService.savePowerStation(powerStation, flag);
+                powerStationService.savePowerStation(powerStation, flag,powerStation.getOwnersName());
                 if(!flag){
                     //更新农户状态
                     String peasantHouseholdId = powerStation.getPeasantHouseholdId();

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

@@ -235,7 +235,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
                     powerStation.setFlowTaskId(flowTaskId);
                     powerStation.setNextProcessNode(PowerStationNodeEnum.设计审核.getCode());
                 }
-                powerStationService.savePowerStation(powerStation, true);
+                powerStationService.savePowerStation(powerStation, true,powerStation.getOwnersName());
             }
         } catch (Exception e){
             throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");

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

@@ -10,7 +10,9 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.TasksRole;
 import com.yeejoin.amos.boot.module.hygf.api.dto.ToDoTasksPageDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
 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.ToDoTasksMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.UserMessageMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IToDoTasksService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.ToDoTasksDto;
 import org.apache.commons.lang.StringUtils;
@@ -24,6 +26,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 人员任务服务实现类
@@ -38,6 +41,9 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
     ToDoTasksMapper toDoTasksMapper;
     @Autowired
     RedisUtils redisUtils;
+    @Autowired
+    UserMessageMapper userMessageMapper;
+
     final static Logger log = LoggerFactory.getLogger(ToDoTasksServiceImpl.class);
 
     /**
@@ -81,9 +87,17 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
             doTasks.setState("已办");
             doTasks.setCompleteTime(new Date());
             toDoTasksMapper.updateById(doTasks);
+
+
+            UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成",  doTasks.getAmosOrgCode());
+            userMessageMapper.insert(userMessage);
+
+
         }
         toDoTasks.setAmosUserId(userId);
         toDoTasksMapper.insert(toDoTasks);
+        UserMessage userMessage=  new UserMessage( toDoTasks.getType(),  toDoTasks.getBusinessId(),  toDoTasks.getAmosUserId(),  new Date(),  toDoTasks.getTaskName()+"待完成",  toDoTasks.getAmosOrgCode());
+        userMessageMapper.insert(userMessage);
     }
 
     @Override
@@ -102,38 +116,53 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
                 doTasks.setState("已办");
                 doTasks.setCompleteTime(new Date());
                 toDoTasksMapper.updateById(doTasks);
+                UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成",  doTasks.getAmosOrgCode());
+                userMessageMapper.insert(userMessage);
+
             }
 
             synchronized (this) {
                 if (redisUtils.hasKey("TAKS_" + role)) {
-                    List<TasksRole> list = JSON.parseArray(redisUtils.get("TAKS_" + role).toString(), TasksRole.class);
-                    toDoTasks.setAmosUserId(list.get(0).getAmosUserId());
-
-                    list.remove(0);
-                    if (list != null && !list.isEmpty()) {
-                        redisUtils.set("TAKS_" + role, JSON.toJSONString(list));
-                    } else {
-                        redisUtils.del("TAKS_" + role);
+                    String id = redisUtils.get("TAKS_" + role).toString();
+                    List<TasksRole> listd = toDoTasksMapper.getTasksRole(role,toDoTasks.getAmosOrgCode());
+
+                    if (listd != null && !listd.isEmpty()) {
+                        List<String> idList=listd.stream().map(TasksRole::getAmosUserId).collect(Collectors.toList());
+                        if(idList.indexOf(id)>-1){
+                             if(idList.indexOf(id)+1>idList.size()-1){
+                                 toDoTasks.setAmosUserId(idList.get(0));
+                                 redisUtils.set("TAKS_" + role, idList.get(0));
+
+                             }else{
+                                 toDoTasks.setAmosUserId(idList.get(idList.indexOf(id)+1));
+                                 redisUtils.set("TAKS_" + role, idList.get(idList.indexOf(id)+1));
+                             }
+                        }else{
+                            toDoTasks.setAmosUserId(idList.get(0));
+                            redisUtils.set("TAKS_" + role, idList.get(0));
+                        }
+                    }else {
+                        log.info("没有此角色人员！");
                     }
 
                 } else {
 
                     List<TasksRole> listd = toDoTasksMapper.getTasksRole(role,toDoTasks.getAmosOrgCode());
-
                     if (listd != null && !listd.isEmpty()) {
+                        List<String> idList=listd.stream().map(TasksRole::getAmosUserId).collect(Collectors.toList());
+                        toDoTasks.setAmosUserId(idList.get(0));
+                        redisUtils.set("TAKS_" + role, idList.get(0));
 
-                        toDoTasks.setAmosUserId(listd.get(0).getAmosUserId());
-
-                        listd.remove(0);
-                        if (listd != null && !listd.isEmpty()) {
-                            redisUtils.set("TAKS_" + role, JSON.toJSONString(listd));
-                        }
-                    } else {
+                    }  else {
 
                         log.info("没有此角色人员！");
                     }
+
                 }
                 toDoTasksMapper.insert(toDoTasks);
+                UserMessage userMessage=  new UserMessage( toDoTasks.getType(),  toDoTasks.getBusinessId(),  toDoTasks.getAmosUserId(),  new Date(),  toDoTasks.getTaskName()+"待完成",  toDoTasks.getAmosOrgCode());
+                userMessageMapper.insert(userMessage);
+
             }
             }catch(Exception e){
                 log.info("生成待办任务失败！");

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

@@ -302,8 +302,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         CompanyModel companyInfo = new CompanyModel();
         FeignClientResult<AgencyUserModel> userResult = null;
         try {
-            FeignClientResult<List<RoleModel>> roleListResult = Privilege.roleClient.queryRoleList(null, null);
-            List<RoleModel> allRoleList = roleListResult.getResult();
+            //FeignClientResult<List<RoleModel>> roleListResult = Privilege.roleClient.queryRoleList(null, null);
+          //  List<RoleModel> allRoleList = roleListResult.getResult();
             List<RoleModel> userRoleList = new ArrayList<>();
             List<Long> roleIds = new ArrayList<>();
             // 1创建公司
@@ -312,14 +312,16 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             companyInfo.setParentId(Long.parseLong(regUnitInfo.getManagementUnitId()));
             companyInfo.setLevel("station");
             companyInfo.setCompanyName(regUnitInfo.getName());
-//            companyInfo.setCompanyCode(regUnitInfo.getUnitTypeCode());
+          //  companyInfo.setCompanyCode(regUnitInfo.getUnitType());
             companyInfo.setContact(regUnitInfo.getHeadName());
             companyInfo.setCompanyType(regUnitInfo.getUnitType());
             companyInfo.setLandlinePhone(regUnitInfo.getHeadPhone());
             FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.create(companyInfo);
-            if (companyResult == null || companyResult.getResult() == null) {
-                throw new BadRequest("单位注册失败");
+
+            if (companyResult == null || companyResult.getStatus()!=200) {
+                throw new BadRequest("单位注册失败！"+companyResult.getDevMessage());
             }
+
             String adminUserName = regUnitInfo.getAdminUserName();
             String loginName = regUnitInfo.getAdminLoginName();
             String pwd = regUnitInfo.getAdminLoginPwd();
@@ -337,24 +339,25 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             List<String> split = Arrays.asList(StringUtils.split(appCodes, ','));
             Map<Long, List<Long>> roleSeqMap = new HashMap<>();
             Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
-            userRoleList = allRoleList.stream().filter(r -> r.getSequenceNbr().toString().equals(regUnitInfo.getRoleId()))
-                    .collect(Collectors.toList());
-            userRoleList.forEach(r -> {
-                if (!roleIds.contains(r.getSequenceNbr())) {
-                    roleIds.add(r.getSequenceNbr());
-                }
-            });
+//            userRoleList = allRoleList.stream().filter(r -> r.getSequenceNbr().toString().equals(regUnitInfo.getRoleId()))
+//                    .collect(Collectors.toList());
+//            userRoleList.forEach(r -> {
+//                if (!roleIds.contains(r.getSequenceNbr())) {
+//                    roleIds.add(r.getSequenceNbr());
+//                }
+//            });
            // roleIds.add(Long.valueOf(regUnitInfo.getRoleId()));
+
+            roleIds.add(userGroupId);
             roleSeqMap.put(companyInfo.getSequenceNbr(), roleIds);
             orgRoles.put(companyInfo.getSequenceNbr(), userRoleList);
-            agencyUserModel.setAppCodes(split);
             agencyUserModel.setOrgRoles(orgRoles);
             agencyUserModel.setOrgRoleSeqs(roleSeqMap);
             userResult = Privilege.agencyUserClient.create(agencyUserModel);
-            if (userResult == null || userResult.getResult() == null) {
-                throw new BadRequest("单位注册失败");
+
+            if (userResult == null || userResult.getStatus()!=200) {
+                throw new BadRequest("单位注册失败！"+userResult.getDevMessage());
             }
-//            String[] userIds = { userResult.getResult().getUserId() };
             regUnitInfo.setAdminUserId(userResult.getResult().getUserId());
             regUnitInfo.setAmosCompanySeq(companyInfo.getSequenceNbr());
             regUnitInfo.setAmosCompanyCode(companyInfo.getOrgCode());
@@ -397,6 +400,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         try {
             FeignClientResult<String> submit = idxFeginService.tokenSubmit(AMOS_STUDIO, AMOS_STUDIO_WEB,requestContext.getToken(),pageId, taskId, planId, null, "DEALER_EXAMINE", null, objectMap);
 
+
+            System.out.println("经销商注册发起"+AMOS_STUDIO+"@"+AMOS_STUDIO_WEB+"@"+requestContext.getToken());
             if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
                 String code = submit.getResult();
                 // 插入记录表
@@ -414,7 +419,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                     dealerReview.setFlowTaskId(flowTaskId);
                     dealerReview.setNextProcessNode(DealerReviewEnum.经销商管理员审核.getCode());
                 }
-                dealerReviewService.saveDealerReview(dealerReview,true,false);
+                dealerReviewService.saveDealerReview(dealerReview,true,false,regUnitInfo.getName());
             }else{
                 throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
             }
@@ -467,7 +472,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                     String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
                     dealerReview.setFlowTaskId(flowTaskId);
                 }
-                dealerReviewService.saveDealerReview(dealerReview,false,true);
+                dealerReviewService.saveDealerReview(dealerReview,false,true,unitInfo.getName());
             }
             this.saveOrUpdate(unitInfo);
         }catch (Exception e){

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.dto.ToDoTasksPageDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.UserMessagePageDto;
+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.UserMessageMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IUserMessageService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserMessageDto;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +24,10 @@ import java.util.List;
  */
 @Service
 public class UserMessageServiceImpl extends BaseService<UserMessageDto,UserMessage,UserMessageMapper> implements IUserMessageService {
+
+    @Autowired
+    UserMessageMapper userMessageMapper;
+
     /**
      * 分页查询
      */
@@ -30,4 +41,19 @@ public class UserMessageServiceImpl extends BaseService<UserMessageDto,UserMessa
     public List<UserMessageDto> queryForUserMessageList()   {
         return this.queryForList("" , false);
     }
+
+
+    public IPage<UserMessage> queryUserMessagePageDto(UserMessagePageDto dto)   {
+
+        //列表数据组装
+        QueryWrapper<UserMessage> qw = new QueryWrapper<>();
+        qw.eq(StringUtils.isNotEmpty(dto.getType()), "type",dto.getType() );
+        qw.eq(StringUtils.isNotEmpty(dto.getAmosUserId()), "amos_user_id",dto.getAmosUserId() );
+        qw.orderBy(Boolean.TRUE, Boolean.FALSE, "creation_time");
+        IPage<UserMessage> toDoTasksPage = userMessageMapper.selectPage(dto, qw);
+        return toDoTasksPage;
+    }
+
+
+
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application.properties

@@ -30,8 +30,8 @@ spring.liquibase.enabled=true
 
 
 ## eureka properties:
-#eureka.instance.prefer-ip-address=true
-#eureka.instance.ip-address=172.16.3.41
+eureka.instance.prefer-ip-address=true
+eureka.instance.ip-address=172.16.3.41
 eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.health-check-url-path=/actuator/health
 eureka.instance.lease-expiration-duration-in-seconds=10
@@ -58,8 +58,8 @@ spring.http.encoding.force=true
 
 
 privilege.fegin.name=AMOS-API-PRIVILEGE
-feign.client.config.default.connect-timeout=20000
-feign.client.config.default.read-timeout=20000
+feign.client.config.default.connect-timeout=40000
+feign.client.config.default.read-timeout=40000
 
 amos.system.user.user-name=hygf_admin
 amos.system.user.password=a1234567

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

@@ -12,10 +12,10 @@ public enum ElectricQuantity {
     FXYGZ("反向总有功","fxzyg"),
     ZXWGZ("正向总无功","zxzwg"),
     FXWGZ("反向总无功","fxzwg"),
-    ZGXWG("总感性无功","zgxwg"),
-    ZZXYG("总正向有功","zzxwg"),
-    ZRXWG("总容性无功","zrxwg"),
-    ZFXYG("总反向有功","zfxyg");
+    ZGXWG("总感性无功电度","zgxwg"),
+    ZZXYG("总正向有功电度","zzxwg"),
+    ZRXWG("总容性无功电度","zrxwg"),
+    ZFXYG("总反向有功电度","zfxyg");
 
 
 

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

@@ -85,9 +85,11 @@ public class CommonConstans {
     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-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -19,7 +19,9 @@ import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.repository.ESEquipmentsRepository;
 import com.yeejoin.amos.component.influxdb.InfluxdbUtil;
 import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.Aggregations;
@@ -217,11 +219,15 @@ public class CommonServiceImpl {
      * @deprecated 获取指标值总和
      */
     public Double getTotalByIndicatior(String gatewayId, String indicator) {
-        String sql = "SELECT * FROM indicators_" + gatewayId + " where equipmentIndexName='" + indicator + "'";
+
+        //用于组装-es查询条件
+        Map<String, List<String>> queryCondtion = new HashMap<>();
+        queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList(indicator));
+        queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
+        List<ESEquipments> result = getListDataByCondtions(queryCondtion, null, ESEquipments.class);
         Double totalvalue = 0.00;
         try {
-            List<Map<String, Object>> mapList = influxdbUtil.query(sql);
-            totalvalue = mapList.stream().filter(stringObjectMap -> !ObjectUtils.isEmpty(stringObjectMap.get("value"))).mapToDouble(l -> Double.parseDouble((String) l.get("value"))).sum();
+            totalvalue = result.stream().filter(stringObjectMap -> !ObjectUtils.isEmpty(stringObjectMap.getValueDouble())).mapToDouble(l -> Double.parseDouble(l.getValueDouble().toString())).sum();
         } catch (Exception e) {
             return totalvalue;
         }
@@ -472,6 +478,52 @@ public class CommonServiceImpl {
     }
 
 
+
+    /**
+     * 根据查询条件获取列表信息
+     *
+     * @param mustQuerCondtion
+     * @param shouldQuerCondtion
+     * @param tClass
+     * @param <T>
+     * @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) {
+        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(likeMap)) {
+            for (String key : likeMap.keySet()) {
+                MatchPhraseQueryBuilder queryBuilder1 = QueryBuilders.matchPhraseQuery(key, "*" + likeMap.get(key) + "*");
+                queryBuilder.must(queryBuilder1);
+            }
+        }
+
+        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;
+    }
+
+
+
     public <T> List<T> getListDataByCondtions(Map<String, List<String>> mustQuerCondtion, Map<String, String> shouldQuerCondtion, Map<String, String> notMustQuerCondtion, Class<T> tClass) {
         BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
         if (!ObjectUtils.isEmpty(mustQuerCondtion)) {

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

@@ -786,18 +786,23 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     public void getStatusJDX(String gatewayId, String stationId, String frontModule) {
         Map<String, List<String>> queryCondtion = new HashMap<>();
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
+
         Map<String, String> likeCodtion = new HashMap<>();
         likeCodtion.put(CommonConstans.QueryStringFrontMoudle, frontModule);
         likeCodtion.put(CommonConstans.QueryStringDisplayName+".keyword", "合位");
         List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class,likeCodtion);
+
+
         List<Map<String, Object>> statusMaps = new ArrayList<>();
         Map<String, List<ESEquipments>> collect = listData.stream().collect(Collectors.groupingBy(ESEquipments::getFrontModule, LinkedHashMap::new, Collectors.toList()));
         for (String s : collect.keySet()) {
             Map<String, Object> statusMap = new HashMap<>();
             if (frontModule.equals("前光")) {
+
                 likeCodtion.remove(CommonConstans.QueryStringDisplayName+".keyword");
                 likeCodtion.put(CommonConstans.QueryStringSystemType+".keyword", "模拟量");
                 List<ESEquipments> value = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class,likeCodtion);
+
                 for (ESEquipments indicatorsDto : value) {
                     Double aDouble = Double.valueOf(indicatorsDto.getValue());
                     statusMap.put(indicatorsDto.getDisplayName() + "Value", String.format(CommonConstans.Twodecimalplaces, aDouble));
@@ -990,9 +995,10 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     public ResultsData getElectricQuantityList(int current, int size, String gatewayId, String stationType) {
         Map<String, List<String>> queryCondtion = new HashMap<>();
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-        queryCondtion.put(CommonConstans.QueryStringFrontMoudle, Arrays.asList("电量表计"));
-        Map<String, List<String>> notMustQueryCondtion = new HashMap<>();
-        List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
+//        queryCondtion.put(CommonConstans.QueryStringFrontMoudle, Arrays.asList("电量表计"));
+        Map<String, String> shouldCondition = new HashMap<>();
+        shouldCondition.put( null != stationType ? "frontModule" : CommonConstans.QueryStringFrontMoudle, "电量表计");
+        List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldCondition, ESEquipments.class);
         List<ESEquipments> windSqlList = esEquipmentsList.stream().filter(esEquipments -> !esEquipments.getDisplayName().equals("") && !esEquipments.getDisplayName().equals("检修状态")).collect(Collectors.toList());
         Map<String, List<ESEquipments>> maps = windSqlList.stream().collect(Collectors.groupingBy(ESEquipments::getSystemType));
         ArrayList<Map<String, String>> resultList = new ArrayList<>();
@@ -1024,10 +1030,10 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         ColModel colModelEventTime = new ColModel("fxzwg", "fxzwg", "反向总无功", "反向总无功", "dataGrid", "fxzwg");
         if (null != stationType) {
             colModelEventMovement = new ColModel("name", "name", "测量点", "测量点", "dataGrid", "name");
-            colModelStationName = new ColModel("zgxwg", "zgxwg", "总感性无功", "总感性无功", "dataGrid", "zgxwg");
-            colModelEventDesc = new ColModel("zzxwg", "zzxwg", "总正向有功", "总正向有功", "dataGrid", "zzxwg");
-            colModelAlarmGroupName = new ColModel("zrxwg", "zrxwg", "总容性无功", "总容性无功", "dataGrid", "zrxwg");
-            colModelEventTime = new ColModel("zfxyg", "zfxyg", "总反向有功", "总反向有功", "dataGrid", "zfxyg");
+            colModelStationName = new ColModel("zgxwg", "zgxwg", "正向无功总", "正向无功总", "dataGrid", "zgxwg");
+            colModelEventDesc = new ColModel("zzxwg", "zzxwg", "正向有功总", "正向有功总", "dataGrid", "zzxwg");
+            colModelAlarmGroupName = new ColModel("zrxwg", "zrxwg", "反向无功总", "反向无功总", "dataGrid", "zrxwg");
+            colModelEventTime = new ColModel("zfxyg", "zfxyg", "反向有功总", "反向有功总", "dataGrid", "zfxyg");
         }
         List<ColModel> listColModel = Arrays.asList(colModelEventMovement, colModelStationName, colModelEventDesc, colModelAlarmGroupName, colModelEventTime);
         ResultsData resultsData = new ResultsData(DataGridMock, listColModel);
@@ -1696,15 +1702,15 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         queryConditon.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("总直流功率"));
         queryConditon.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         Map<String, String> shouldConditon = new HashMap<>();
-        shouldConditon.put(CommonConstans.QueryStringEquipmentIndexName, "逆变器");
+        shouldConditon.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
         List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryConditon, shouldConditon, ESEquipments.class);
 
         Map<String, List<String>> queryConditon1 = new HashMap<>();
         queryConditon1.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("有功功率"));
         queryConditon1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         Map<String, String> shouldConditon1 = new HashMap<>();
-        shouldConditon1.put(CommonConstans.QueryStringEquipmentIndexName, "逆变器");
-        List<ESEquipments> listData1 = commonServiceImpl.getListDataByCondtions(queryConditon, shouldConditon, ESEquipments.class);
+        shouldConditon1.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
+        List<ESEquipments> listData1 = commonServiceImpl.getListDataByCondtions(queryConditon1, shouldConditon1, ESEquipments.class);
 
         // 将两组数据合并成一个集合中 将总直流功率数据 放入 另一个集合的valueLable中
         for (ESEquipments listDatum : listData) {
@@ -2044,8 +2050,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         List<ESEquipments> totalEquipmentList = commonServiceImpl.getListDataByCondtions(queryCondition, shouldCondition, ESEquipments.class);
         totalEquipmentList.forEach(indicatorsDto -> result.put(indicatorsDto.getEquipmentNumber(), "正常运行"));
         Map<String, List<String>> queryCondition1 = new HashMap<>();
-        queryCondition.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("运行", "待机", "故障停机", "告警运行", "限额运行", "停机", "通讯故障", "'降额运行'"));
-        queryCondition.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
+        queryCondition1.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("运行", "待机", "故障停机", "告警运行", "限额运行", "停机", "通讯故障", "'降额运行'"));
+        queryCondition1.put(CommonConstans.QueryStringValueKeyword, Arrays.asList("true"));
+        queryCondition1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondition1, shouldCondition, ESEquipments.class);
         indicatorsDtoList.forEach(esEquipments -> {
             if (!"运行".equals(esEquipments.getEquipmentIndexName())) {