修改bug

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -104,6 +104,7 @@ public class ControllerAop {
         urls.add("/hygf/unit-info/verifyTelCode/.*/.*");
         urls.add("/hygf/peasant-household/mobile/login");
         urls.add("/hygf/qiyuesuo/callback");
+        urls.add("/hygf/unit-info/unitRegister");
 
 		// 获取请求路径
 		for (String uri : urls) {

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

@@ -102,7 +102,7 @@ public class UnitInfoDto  extends BaseDto {
 
     //所属区域公司id
 
-    private List<Long> regionalCompaniesSeq;
+    private List<String> regionalCompaniesSeq;
     //所属区域公司名称
     private String regionalCompaniesName;
     //所属区域公司code

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

@@ -188,7 +188,7 @@ public class UnitInfo extends BaseEntity {
 
     //所属区域公司id
     @TableField(value = "regional_companies_seq",typeHandler = FastjsonTypeHandler.class)
-    private List<Long> regionalCompaniesSeq;
+    private List<String> regionalCompaniesSeq;
     //所属区域公司名称
     @TableField("regional_companies_name")
     private String regionalCompaniesName;

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

@@ -224,7 +224,7 @@ public class PersonnelBusinessController extends BaseController {
            personnelBusinessServiceImpl.replace(id);
            return ResponseHelper.buildResponse(null);
        }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/emqx/DealerExamineMessageService.java

+package com.yeejoin.amos.boot.module.hygf.biz.emqx;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.component.emq.EmqxListener;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import javax.annotation.PostConstruct;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+/**
+ * 告警消息数据处理
+ *
+ * @author Administrator
+ */
+    @Component
+    @EnableScheduling
+    @Slf4j
+    public class DealerExamineMessageService extends EmqxListener {
+
+    @Autowired
+    protected EmqKeeper emqKeeper;
+    @Autowired
+    AmosRequestContext amosAuth;
+
+    @Autowired
+    AmosRequestContext amosRequestContext;
+
+    @Autowired
+    private TransactionDefinition transactionDefinition;
+
+
+    private static final BlockingQueue<JSONObject> blockingQueue = new LinkedBlockingQueue<JSONObject>();
+
+    @PostConstruct
+    void init() throws Exception {
+    new Thread(task_runnable).start();
+    emqKeeper.subscript("DEALER_EXAMINE", 2, this);
+    }
+
+    Runnable task_runnable = new Runnable() {
+    @Override
+    public void run() {
+        boolean isRun = true;
+        int k = 0;
+        while (isRun) {
+        k++;
+        isRun = k < Integer.MAX_VALUE;
+        try {
+            JSONObject analysisResult = blockingQueue.take();
+            RequestContext.setAppKey(amosAuth.getAppKey());
+            RequestContext.setProduct(amosAuth.getProduct());
+            RequestContext.setToken(amosAuth.getToken());
+            processEvent(analysisResult);
+        } catch (Exception e) {
+        e.printStackTrace();
+        }
+        }
+        }
+    };
+
+
+    //解析预警消息
+    @Transactional
+    public void processEvent(JSONObject analysisResult) {
+
+    }
+
+    @Override
+    public void processMessage(String topic, MqttMessage message) throws Exception {
+        System.out.println(message);
+
+        JSONObject analysisResult = JSONObject.parseObject(new String(message.getPayload()));
+        blockingQueue.add(analysisResult);
+    }
+
+
+
+
+
+
+    }

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;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.component.emq.EmqxListener;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+import javax.annotation.PostConstruct;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+/**
+ * 告警消息数据处理
+ *
+ * @author Administrator
+ */
+    @Component
+    @EnableScheduling
+    @Slf4j
+    public class StationAuditMessageService extends EmqxListener {
+
+    @Autowired
+    protected EmqKeeper emqKeeper;
+    @Autowired
+    AmosRequestContext amosAuth;
+
+    @Autowired
+    AmosRequestContext amosRequestContext;
+
+    @Autowired
+    private TransactionDefinition transactionDefinition;
+
+
+    private static final BlockingQueue<JSONObject> blockingQueue = new LinkedBlockingQueue<JSONObject>();
+
+    @PostConstruct
+    void init() throws Exception {
+    new Thread(task_runnable).start();
+    emqKeeper.subscript("STATION_AUDIT", 2, this);
+    }
+
+    Runnable task_runnable = new Runnable() {
+    @Override
+    public void run() {
+        boolean isRun = true;
+        int k = 0;
+        while (isRun) {
+        k++;
+        isRun = k < Integer.MAX_VALUE;
+        try {
+            JSONObject analysisResult = blockingQueue.take();
+            RequestContext.setAppKey(amosAuth.getAppKey());
+            RequestContext.setProduct(amosAuth.getProduct());
+            RequestContext.setToken(amosAuth.getToken());
+            processEvent(analysisResult);
+        } catch (Exception e) {
+        e.printStackTrace();
+        }
+        }
+        }
+    };
+
+
+    //解析预警消息
+    @Transactional
+    public void processEvent(JSONObject analysisResult) {
+
+    }
+
+    @Override
+    public void processMessage(String topic, MqttMessage message) throws Exception {
+        System.out.println(message);
+
+        JSONObject analysisResult = JSONObject.parseObject(new String(message.getPayload()));
+        blockingQueue.add(analysisResult);
+    }
+
+
+
+
+
+
+    }

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

@@ -138,7 +138,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             publicAgencyUser.setWeight(userDataJBDto.getWeight());
             publicAgencyUser.setEmergencyTelephone(userDataJBDto.getEmergencyTelephone());
             publicAgencyUser.setDomicileAddress(userDataJBDto.getDomicileAddress());
-            publicAgencyUser.setPosition(JSON.toJSONString(userDataJBDto.getPosition()));
+            publicAgencyUser.setPosition(userDataJBDto.getPosition()!=null?JSON.toJSONString(userDataJBDto.getPosition()):null);
             publicAgencyUser.setNowAddress(userDataJBDto.getNowAddress());
             publicAgencyUser.setNativePlace(userDataJBDto.getNativePlace());
             publicAgencyUser.setPoliticalOutlook(userDataJBDto.getPoliticalOutlook());
@@ -235,7 +235,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             publicAgencyUser.setWeight(userDataJBDto.getWeight());
             publicAgencyUser.setEmergencyTelephone(userDataJBDto.getEmergencyTelephone());
             publicAgencyUser.setDomicileAddress(userDataJBDto.getDomicileAddress());
-            publicAgencyUser.setPosition(JSON.toJSONString(userDataJBDto.getPosition()));
+            publicAgencyUser.setPosition(userDataJBDto.getPosition()!=null?JSON.toJSONString(userDataJBDto.getPosition()):null);
             publicAgencyUser.setNowAddress(userDataJBDto.getNowAddress());
             publicAgencyUser.setNativePlace(userDataJBDto.getNativePlace());
             publicAgencyUser.setPoliticalOutlook(userDataJBDto.getPoliticalOutlook());
@@ -307,16 +307,13 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
 
         List<String> userId = new ArrayList<>();
         userId.add(publicAgencyUse.getAmosUserId());
-        List<String> userId1 = new ArrayList<>();
-        userId1.add(publicAgencyUsex.getAmosUserId());
 
 
         //修改新管理员
         Privilege.groupUserClient.create(userGroupId, userId);
 
-
-        //修改旧管理员
-        Privilege.groupUserClient.create(1679675395965743106L, userId1);
+        //删除旧管理员
+        Privilege.groupUserClient.deleteGroupUser(userGroupId,publicAgencyUsex.getAmosUserId());
     }
 
 

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

@@ -207,7 +207,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         }
         // 保存并审核
         try {
-            FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planId, null, null, null, objectMap);
+            FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planId, null, "STATION_AUDIT", null, objectMap);
             if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
                 peasantHousehold.setSurveyOrNot(2);
                 peasantHousehold.setReview(1);

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

@@ -190,7 +190,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             PersonnelBusiness re=new PersonnelBusiness();
             PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
             publicAgencyUser.setAmosUserId(regUnitInfo.getAdminUserId());
-            publicAgencyUser.setAmosUserName(regUnitInfo.getAdminUserName());
+            publicAgencyUser.setAmosUserName(regUnitInfo.getAdminLoginName());
             publicAgencyUser.setRealName(regUnitInfo.getAdminLoginName());
             publicAgencyUser.setRole("["+regUnitInfo.getRoleId()+"]");
             publicAgencyUser.setEmergencyTelephone(regUnitInfo.getAdminPhone());
@@ -395,7 +395,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         DealerReview dealerReview = new DealerReview();
         // 保存并审核
         try {
-            FeignClientResult<String> submit = idxFeginService.tokenSubmit(AMOS_STUDIO, AMOS_STUDIO_WEB,requestContext.getToken(),pageId, taskId, planId, null, null, null, objectMap);
+            FeignClientResult<String> submit = idxFeginService.tokenSubmit(AMOS_STUDIO, AMOS_STUDIO_WEB,requestContext.getToken(),pageId, taskId, planId, null, "DEALER_EXAMINE", null, objectMap);
 
             if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
                 String code = submit.getResult();
@@ -457,7 +457,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
              // 2. 更新流程状态
                String code = null;
             // 3. 工作流执行
-            FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, null, null, kv);
+            FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, "DEALER_EXAMINE", null, kv);
             if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
                 code = submit.getResult();
                 // 获取流程信息
@@ -585,12 +585,12 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
        List<RegionalCompanies> regionalComp= new ArrayList<>();
        FeignClientResult<Collection<CompanyModel>> feignClientResult=  Privilege.companyClient.querySubAgencyTree(regionalCompanies);
        List<CompanyModel>  companyModel = (List<CompanyModel>)feignClientResult.getResult();
-       List<Long>  lisd=unitInfo.getRegionalCompaniesSeq();
+       List<String>  lisd=unitInfo.getRegionalCompaniesSeq();
        if(companyModel!=null&&!companyModel.isEmpty()&&lisd!=null&&!lisd.isEmpty()){
-           for (Long aLong : lisd) {
+           for (String aLong : lisd) {
                for (CompanyModel compan : companyModel) {
-                   if(compan.getSequenceNbr().longValue()==aLong.longValue()){
-                       RegionalCompanies re=  new RegionalCompanies(aLong, compan.getCompanyName(), compan.getOrgCode(), unitInfo.getSequenceNbr());
+                   if(compan.getSequenceNbr().longValue()==Long.valueOf(aLong).longValue()){
+                       RegionalCompanies re=  new RegionalCompanies(Long.valueOf(aLong), compan.getCompanyName(), compan.getOrgCode(), unitInfo.getSequenceNbr());
                        regionalComp.add(re);
                        continue;
                    }