解决冲突

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

-package com.yeejoin.amos.boot.module.jxiop.api.dto;
+package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 设计信息
@@ -22,31 +25,40 @@ public class DesignInformationDto  extends BaseDto {
 
 
     @ApiModelProperty(value = "典型设计图信息")
-    private String typicalDiagram;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> typicalDiagram;
 
     @ApiModelProperty(value = "组件排布图")
-    private String componentLayout;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> componentLayout;
 
     @ApiModelProperty(value = "组件支架图")
-    private String componentBracket;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> componentBracket;
 
     @ApiModelProperty(value = "组串接线图")
-    private String connectionLine;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> connectionLine;
 
     @ApiModelProperty(value = "一次接线图")
-    private String onceLine;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> onceLine;
 
     @ApiModelProperty(value = "组件")
-    private String assembly;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> assembly;
 
     @ApiModelProperty(value = "逆变器")
-    private String inverter;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> inverter;
 
     @ApiModelProperty(value = "电表箱")
-    private String electricityMeter;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> electricityMeter;
 
     @ApiModelProperty(value = "支架")
-    private String support;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> support;
 
     @ApiModelProperty(value = " 防滑雪措施")
     private String antiSkiing;

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

@@ -50,8 +50,8 @@ public class PowerStationDto  extends BaseDto {
     @ApiModelProperty(value = "技术审核状态")
     private String technologyStatus;
 
-    @ApiModelProperty(value = "流程id")
-    private String workflowId;
+    @ApiModelProperty(value = "流程实例id")
+    private String processInstanceId;
 
     @ApiModelProperty(value = "农户id")
     private String peasantHouseholdId;
@@ -61,4 +61,9 @@ public class PowerStationDto  extends BaseDto {
 
     @ApiModelProperty(value = "待执行节点角色")
     private String nodeRole;
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+
+    @ApiModelProperty(value = "流程定义id")
+    private String processDefinitionId;
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
 
-import com.yeejoin.amos.boot.module.jxiop.api.dto.DesignInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DesignInformationDto;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 

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

-package com.yeejoin.amos.boot.module.jxiop.api.entity;
+package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 设计信息
@@ -17,7 +19,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_design_information")
+@TableName(value = "hygf_design_information",autoResultMap = true)
 public class DesignInformation extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -25,56 +27,56 @@ public class DesignInformation extends BaseEntity {
     /**
      * 典型设计图信息
      */
-	@TableField("typical_diagram")
-    private String typicalDiagram;
+	@TableField(value = "typical_diagram",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> typicalDiagram;
 
     /**
      * 组件排布图
      */
-	@TableField("component_layout")
-    private String componentLayout;
+	@TableField(value = "component_layout",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> componentLayout;
 
     /**
      * 组件支架图
      */
-	@TableField("component_bracket")
-    private String componentBracket;
+	@TableField(value = "component_bracket",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> componentBracket;
 
     /**
      * 组串接线图
      */
-	@TableField("connection_line")
-    private String connectionLine;
+	@TableField(value = "connection_line",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> connectionLine;
 
     /**
      * 一次接线图
      */
-	@TableField("once_line")
-    private String onceLine;
+	@TableField(value = "once_line",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> onceLine;
 
     /**
      * 组件
      */
-	@TableField("assembly")
-    private String assembly;
+	@TableField(value = "assembly",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> assembly;
 
     /**
      * 逆变器
      */
-	@TableField("inverter")
-    private String inverter;
+	@TableField(value = "inverter",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> inverter;
 
     /**
      * 电表箱
      */
-	@TableField("electricity_meter")
-    private String electricityMeter;
+	@TableField(value = "electricity_meter",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> electricityMeter;
 
     /**
      * 支架
      */
-	@TableField("support")
-    private String support;
+	@TableField(value = "support",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> support;
 
     /**
      *  防滑雪措施

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

@@ -80,8 +80,8 @@ public class PowerStation extends BaseEntity {
     /**
      * 流程id
      */
-	@TableField("workflow_id")
-    private String workflowId;
+	@TableField("process_instance_id")
+    private String processInstanceId;
 
     /**
      * 农户id
@@ -89,6 +89,21 @@ public class PowerStation extends BaseEntity {
 	@TableField("peasant_household_id")
     private String peasantHouseholdId;
 
+    /**
+     * 任务id
+     */
+    @TableField("task_id")
+    private String taskId;
+
+    /**
+     * 流程定义id
+     */
+    @TableField("process_definition_id")
+    private String processDefinitionId;
+
+    /**
+     * 小程序路由
+     */
     @TableField("node_routing")
     private String nodeRouting;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/fegin/IdxFeginService.java

+package com.yeejoin.amos.boot.module.hygf.api.fegin;
+
+import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
+import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.Map;
+
+@FeignClient(value = "AMOS-IDX", path = "idx", configuration = {MultipartSupportConfig.class})
+public interface IdxFeginService {
+
+    /**
+     *通用表单提交 数据填报
+     */
+    @RequestMapping(value = "/table/submit", method = RequestMethod.POST)
+    FeignClientResult<String> submit(@RequestParam(value = "pageId") long pageId,
+                                     @RequestParam(value = "taskId",required = false) String taskId,
+                                     @RequestParam(value = "planInstanceId", required = false) String planInstanceId,
+                                     @RequestParam(value = "bizField", required = false) String bizField,
+                                     @RequestParam(value = "topic", required = false) String topic,
+                                     @RequestParam(value = "tableName", required = false) String tableName,
+                                     @RequestBody Map<String, Object> kv) throws Exception;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/DesignInformationMapper.java

-package com.yeejoin.amos.boot.module.jxiop.api.mapper;
+package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
-import com.yeejoin.amos.boot.module.jxiop.api.entity.DesignInformation;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

 package com.yeejoin.amos.boot.module.hygf.api.service;
 
 
+import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStation;
+
 /**
  * 接口类
  *
@@ -9,4 +11,11 @@ package com.yeejoin.amos.boot.module.hygf.api.service;
  */
 public interface IPowerStationService {
 
+    /**
+     * 保存审核实例
+     * @param powerStation 审核对象
+     * @return 状态
+     */
+    boolean savePowerStation(PowerStation powerStation);
+
 }

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

-package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -6,14 +6,14 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import java.util.List;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.DesignInformationServiceImpl;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DesignInformationServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.DesignInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DesignInformationDto;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 

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

-package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.jxiop.api.entity.DesignInformation;
-import com.yeejoin.amos.boot.module.jxiop.api.mapper.DesignInformationMapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.DesignInformationMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IDesignInformationService;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.DesignInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DesignInformationDto;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

@@ -30,4 +30,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     public List<PowerStationDto> queryForPowerStationList()   {
         return this.queryForList("" , false);
     }
+
+
+    @Override
+    public boolean savePowerStation(PowerStation powerStation) {
+        return this.save(powerStation);
+    }
 }
\ No newline at end of file

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

@@ -7,17 +7,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
+import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.SurveyInformationMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationService;
 import com.yeejoin.amos.boot.module.hygf.api.service.ISurveyInformationService;
 import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.DesignInformationDto;
-import com.yeejoin.amos.boot.module.jxiop.api.entity.DesignInformation;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.DesignInformationServiceImpl;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DesignInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DesignInformationServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
-import org.apache.commons.beanutils.ConvertUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,11 +27,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 勘察信息服务实现类
@@ -38,6 +36,7 @@ import java.util.List;
  * @date 2023-07-07
  */
 @Service
+@Slf4j
 public class SurveyInformationServiceImpl extends BaseService<SurveyInformationDto,SurveyInformation,SurveyInformationMapper> implements ISurveyInformationService {
 
 
@@ -62,8 +61,16 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
     @Autowired
     RedisUtils redisUtils;
 
-    private static final String regionRedis="app_region_redis";
+    @Autowired
+    IdxFeginService idxFeginService;
+
+    @Autowired
+    IPowerStationService powerStationService;
 
+    private static final String regionRedis="app_region_redis";
+    private static final String OPERATION_TYPE_SUBMIT="submit";
+    private static final String OPERATION_TYPE_APPLY="apply";
+    private static final String IDX_REQUEST_STATE="200";
 
     /**
      * 分页查询
@@ -157,12 +164,30 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         }
         peasantHousehold.setPermanentAddressName(permanentAddressName.substring(0, permanentAddressName.length() - 2));
 
-        if("submit".equals(operationType)){
+        if(OPERATION_TYPE_SUBMIT.equals(operationType)){
             peasantHousehold.setSurveyOrNot(1);
-        }else if("apply".equals(operationType)){
-            peasantHousehold.setSurveyOrNot(2);
-            peasantHousehold.setReview(1);
-
+        }else if(OPERATION_TYPE_APPLY.equals(operationType)){
+            Map<String, Object> objectMap = new HashMap<>();
+            objectMap.put("approveStatus", "yes");
+            // 保存并审核
+            try {
+                FeignClientResult<String> submit = idxFeginService.submit(1679778420550037506L, null, "c4ed1873-0dc6-4518-a7a9-dbc588ef35e5", null, null, null, objectMap);
+                if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
+                    String code = submit.getResult();
+                    peasantHousehold.setSurveyOrNot(2);
+                    peasantHousehold.setReview(1);
+                    // 插入记录表
+                    PowerStation powerStationDto = new PowerStation();
+                    powerStationDto.setPowerStationCode(peasantHousehold.getPeasantHouseholdNo());
+                    powerStationDto.setOwnersName(peasantHousehold.getOwnersName());
+                    powerStationDto.setProjectAddress(peasantHousehold.getProjectAddressName());
+                    powerStationDto.setProcessStatus("进行中");
+                    powerStationService.savePowerStation(powerStationDto);
+                    log.info("启动流程成功：{}", code);
+                }
+            } catch (Exception e){
+                e.getMessage();
+            }
         }
         peasantHouseholdServiceImpl.saveOrUpdate(peasantHousehold);
         return surveyInfoAllDto;