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/ContractDataDto.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @description:
  * @author: tw
@@ -32,4 +34,5 @@ public class ContractDataDto {
     Double  personalOffsetX;
     Double  personalOffsetY;
     Integer personalKeywordIndex;
+    private List<Long> sealId;
 }

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

@@ -134,6 +134,6 @@ public class HouseholdContractDto  extends BaseDto {
      * */
 
     private Date signingTime;
-
+    private String userId;
 
 }

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

@@ -38,4 +38,8 @@ public class HouseholdContractPageDto extends Page<HouseholdContract> {
      * 签字状态
      */
     private String signStatus;
+
+
+    private String userId;
+
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="SealDictionaryDto", description="")
+public class SealDictionaryDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "平台公司id")
+    private Long amosCompanySeq;
+
+    @ApiModelProperty(value = "平台公名称")
+    private String amosCompanyName;
+
+    @ApiModelProperty(value = "印章id")
+    private Long sealId;
+
+    @ApiModelProperty(value = "盖章人")
+    private String sealedUser;
+
+    @ApiModelProperty(value = "盖章人手机号")
+    private String sealedPhone;
+    private String category;
+
+    private String companyTenantName;
+}

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

@@ -245,4 +245,7 @@ public class HouseholdContract extends BaseEntity {
     @TableField("signing_time")
     private Date signingTime;
 
+
+    @TableField("user_id")
+    private String userId;
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_seal_dictionary")
+public class SealDictionary extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 平台公司id
+     */
+	@TableField("amos_company_seq")
+    private Long amosCompanySeq;
+
+    /**
+     * 平台公名称
+     */
+	@TableField("amos_company_name")
+    private String amosCompanyName;
+
+    /**
+     * 印章id
+     */
+	@TableField("seal_id")
+    private Long sealId;
+
+    /**
+     * 盖章人
+     */
+	@TableField("sealed_user")
+    private String sealedUser;
+
+    /**
+     * 盖章人手机号
+     */
+	@TableField("sealed_phone")
+    private String sealedPhone;
+	/*
+	契约锁业务分类
+	* **/
+    @TableField("category")
+    private String category;
+    /**
+     * 契约锁签署公司
+     * */
+    @TableField("company_tenant_name")
+    private String companyTenantName;
+
+
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.SealDictionary;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-23
+ */
+public interface SealDictionaryMapper extends BaseMapper<SealDictionary> {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-23
+ */
+public interface ISealDictionaryService {
+
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.SealDictionaryMapper">
+
+</mapper>

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

@@ -219,9 +219,10 @@ public class HouseholdContractController extends BaseController {
         householdContract.setProjectAddressName(peasantHousehold.getProjectAddressName());
         householdContract.setPermanentAddressDetail(peasantHousehold.getPermanentAddressDetail());
         householdContract.setPermanentAddressName(peasantHousehold.getPermanentAddressName());
+        householdContract.setUserId(peasantHousehold.getUserId());
         householdContractServiceImpl.addHouseholdContract(householdContract);
 
-        householdContractServiceImpl.reissueinitiateHouseholdContract(householdContract,householdContract.getSequenceNbr());
+        householdContractServiceImpl.reissueinitiateHouseholdContract(peasantHousehold,householdContract.getSequenceNbr());
 
         return ResponseHelper.buildResponse(householdContract);
     }

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.QueryWrapper;
 import com.qiyuesuo.sdk.v2.SdkClient;
 import com.qiyuesuo.sdk.v2.bean.*;
 import com.qiyuesuo.sdk.v2.exception.BaseSdkException;
@@ -13,6 +14,8 @@ import com.qiyuesuo.sdk.v2.response.SdkResponse;
 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.mapper.SealDictionaryMapper;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
 import io.swagger.annotations.Api;
@@ -20,10 +23,7 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -46,7 +46,8 @@ import java.util.Map;
 public class QiyuesuoController {
     private static final Logger logger = LoggerFactory.getLogger(QiyuesuoController.class);
 
-
+    @Autowired
+    SealDictionaryMapper sealDictionaryMapper;
     @Autowired
     QiyuesuoServiceImpl qiyuesuoService;
     @Autowired
@@ -71,7 +72,18 @@ public class QiyuesuoController {
 
         return  ResponseHelper.buildResponse(result.getResult());
     }
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(httpMethod = "post",value = "合同token",   notes = "合同token")
+    @PostMapping (value = "/getContractTokengz/{sequenceNbr}")
+    public ResponseModel<Object> getContractSdkResponseSequenceNbr(@RequestBody ContractMiniappTicketRequest   request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 
+        QueryWrapper<SealDictionary> queryWrapper=new QueryWrapper();
+        queryWrapper.eq("amos_company_seq",sequenceNbr);
+        SealDictionary sealDictionary=sealDictionaryMapper.selectOne(queryWrapper);
+        request.setUser(new User( sealDictionary.getSealedPhone(),  "MOBILE"));
+        SdkResponse<MiniappTicketResult> result=  qiyuesuoService.getContractSdkResponse(request);
+        return  ResponseHelper.buildResponse(result.getResult());
+    }
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@@ -152,14 +164,14 @@ public class QiyuesuoController {
         contract.setCategory(new Category("智信能源合同"));
        // contract.setBizId("");
         contract.setSend(false);
-// 个人
+         // 个人
         Signatory signatory1 = new Signatory();
         signatory1.setTenantName(username);
         signatory1.setTenantType("PERSONAL");
         signatory1.setReceiver(new User(username, contact, "MOBILE"));
         signatory1.setSerialNo(1);
 
-// 对接方
+         // 对接方
         Signatory signatory2 = new Signatory();
         signatory2.setTenantName("智信能源科技有限公司-测试");
         signatory2.setTenantType("COMPANY");
@@ -167,15 +179,15 @@ public class QiyuesuoController {
         signatory2.setSerialNo(2);
         Action action = new Action("COMPANY", 0);
         signatory2.addAction(action);
-// 设置签署方
+         // 设置签署方
         contract.addSignatory(signatory1);
         contract.addSignatory(signatory2);
 
-// 创建合同
+        // 创建合同
         ContractDraftRequest request = new ContractDraftRequest(contract);
         String response = sdkClient.service(request);
         SdkResponse<Contract> responseObj  = JSONUtils.toQysResponse(response, Contract.class);
-// 返回结果
+       // 返回结果
         Contract result=new Contract();
         if(responseObj.getCode() == 0) {
              result = responseObj.getResult();

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+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.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.SealDictionaryServiceImpl;
+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.hygf.api.dto.SealDictionaryDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-23
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/seal-dictionary")
+public class SealDictionaryController extends BaseController {
+
+    @Autowired
+    SealDictionaryServiceImpl sealDictionaryServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<SealDictionaryDto> save(@RequestBody SealDictionaryDto model) {
+	    model = sealDictionaryServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<SealDictionaryDto> updateBySequenceNbrSealDictionary(@RequestBody SealDictionaryDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(sealDictionaryServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(sealDictionaryServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<SealDictionaryDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(sealDictionaryServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<SealDictionaryDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<SealDictionaryDto> page = new Page<SealDictionaryDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(sealDictionaryServiceImpl.queryForSealDictionaryPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<SealDictionaryDto>> selectForList() {
+	    return ResponseHelper.buildResponse(sealDictionaryServiceImpl.queryForSealDictionaryList());
+	}
+}

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

@@ -7,8 +7,10 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.ContractTemplate;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
+import com.yeejoin.amos.boot.module.hygf.api.entity.SealDictionary;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.ContractTemplateMapper;
 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.service.IHouseholdContractService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,18 +42,8 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
     @Autowired
     QiyuesuoServiceImpl qiyuesuoServiceImpl;
 
-   // @Value("${qiyuesuo.category}")
-    String category="智信能源合同";
-   // @Value("${qiyuesuo.companyTenantName}")
-    String companyTenantName="智信能源科技有限公司";
-    //@Value("${qiyuesuo.companyUsername}")
-    String companyUsername="于鹏";
-   @Value("${qiyuesuo.companyContact}")
-    String companyContact;
-
-
-
-
+    @Autowired
+    SealDictionaryMapper sealDictionaryMapper;
 
     @Autowired
     ContractTemplateMapper contractTemplateMapper;
@@ -80,6 +72,9 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         qw.eq(StringUtils.isNotEmpty(dto.getInitiateStatus()), "initiate_status",dto.getInitiateStatus() );
         qw.eq(StringUtils.isNotEmpty(dto.getSurveyStatus()), "survey_status",dto.getSurveyStatus() );
         qw.eq(StringUtils.isNotEmpty(dto.getSignStatus()), "sign_status",dto.getSignStatus() );
+        qw.eq(StringUtils.isNotEmpty(dto.getUserId()), "user_id",dto.getUserId() );
+
+
 
         if (StringUtils.isNotEmpty(dto.getOrderBy())) {
             qw.orderBy(Boolean.TRUE, dto.getIsASC(), dto.getOrderBy());
@@ -104,17 +99,6 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         householdContractMapper.insert(householdContract);
     }
 
-//    public void reissueHouseholdContract(HouseholdContract householdContract){
-//
-//        householdContract.setContractNumber(this.getnum());//合同编号
-//        householdContract.setSurveyStatus(HouseholdContractEnum.勘察状态_未勘察.getCode());
-//        householdContract.setStatus(HouseholdContractEnum.合同状态_未签署.getCode());
-//        householdContract.setSignStatus(HouseholdContractEnum.签字状态_未签字.getCode());
-//        householdContract.setStampStatus(HouseholdContractEnum.盖章状态_未盖章.getCode());
-//        householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());
-//        householdContractMapper.insert(householdContract);
-//    }
-
 
     public String getnum() {
         SimpleDateFormat format = new SimpleDateFormat("YYYYMMddHHmmssSSS");
@@ -126,9 +110,6 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
 
 
     public HouseholdContract initiateHouseholdContract(HouseholdContractDto model){
-
-
-
         HouseholdContract householdContract=  householdContractMapper.selectById(model.getSequenceNbr());
         householdContract.setPartyA(model.getPartyA());
         householdContract.setPartyB(model.getPartyB());
@@ -143,30 +124,29 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         householdContract.setStationPower(model.getStationPower());
         householdContract.setName(model.getName());
         //调用第三方
-//      SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
-        //签署结束时间默认一个月后
-//      LocalDateTime now = LocalDateTime.now();
-//      LocalDateTime afterOneMonth = now.plus(Period.ofMonths(1));
         ContractDataDto contractDataDto =new ContractDataDto();
         contractDataDto.setUsername(model.getPartyA());
         contractDataDto.setContact(model.getPeasantHouseholdPhone());
         contractDataDto.setIDCard(model.getPeasantHouseholdCard());
         contractDataDto.setSubject(model.getName());
-//      contractDataDto.setEndTime(sdf.format(afterOneMonth));
-////    contractDataDto.setExpireTime(sdf.format(model.getLeaseEndDate()));
 
-           contractDataDto.setCategory(category);
-           contractDataDto.setCompanyTenantName(companyTenantName);
-           contractDataDto.setCompanyUsername(companyUsername);
-        contractDataDto.setCompanyContact(companyContact);
-        contractDataDto.setEmplateId(model.getContractTemplateId());
+        QueryWrapper<SealDictionary> queryWrapper=new QueryWrapper();
+        queryWrapper.eq("amos_company_seq",householdContract.getRegionalCompaniesSeq());
+        SealDictionary sealDictionary=sealDictionaryMapper.selectOne(queryWrapper);
+        contractDataDto.setCategory(sealDictionary.getCategory());
+        contractDataDto.setCompanyTenantName(sealDictionary.getCompanyTenantName());
+        contractDataDto.setCompanyUsername(sealDictionary.getSealedUser());
+        contractDataDto.setCompanyContact(sealDictionary.getSealedPhone());
+        List<Long> listSealId= new ArrayList<>();
+        listSealId.add(sealDictionary.getSealId());
+        contractDataDto.setSealId(listSealId);
+
 
 
         QueryWrapper<ContractTemplate> qu=new QueryWrapper();
         qu.eq("template_id",model.getContractTemplateId());
         ContractTemplate contractTemplate=contractTemplateMapper.selectOne(qu);
-
-
+        contractDataDto.setEmplateId(model.getContractTemplateId());
         contractDataDto.setCompanykeyword(contractTemplate.getCompanyKeyword());
         contractDataDto.setCompanyPage(contractTemplate.getCompanyPage());
         contractDataDto.setCompanyOffsetX(contractTemplate.getCompanyOffsetx());
@@ -178,8 +158,6 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         contractDataDto.setPersonalOffsetY(contractTemplate.getPersonalOffsety());
         contractDataDto.setPersonalKeywordIndex(contractTemplate.getPersonalKeywordIndex());
 
-
-
         List<TemplateParamDto> templateParam=new ArrayList<>();
         SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");
         templateParam.add(new TemplateParamDto("partyA",householdContract.getPartyA()!=null?householdContract.getPartyA():null));
@@ -206,9 +184,6 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
 
 
     public HouseholdContract reissueinitiateHouseholdContract(HouseholdContract model,Long sequenceNbr){
-
-
-
         HouseholdContract householdContract=  householdContractMapper.selectById(sequenceNbr);
         householdContract.setPartyA(model.getPartyA());
         householdContract.setPartyB(model.getPartyB());
@@ -222,31 +197,29 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         householdContract.setComponentPower(model.getComponentPower());
         householdContract.setStationPower(model.getStationPower());
         householdContract.setName(model.getName());
-        //调用第三方
-//      SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
-        //签署结束时间默认一个月后
-//      LocalDateTime now = LocalDateTime.now();
-//      LocalDateTime afterOneMonth = now.plus(Period.ofMonths(1));
         ContractDataDto contractDataDto =new ContractDataDto();
         contractDataDto.setUsername(model.getPartyA());
         contractDataDto.setContact(model.getPeasantHouseholdPhone());
         contractDataDto.setIDCard(model.getPeasantHouseholdCard());
         contractDataDto.setSubject(model.getName());
-//      contractDataDto.setEndTime(sdf.format(afterOneMonth));
-////    contractDataDto.setExpireTime(sdf.format(model.getLeaseEndDate()));
 
-        contractDataDto.setCategory(category);
-        contractDataDto.setCompanyTenantName(companyTenantName);
-        contractDataDto.setCompanyUsername(companyUsername);
-        contractDataDto.setCompanyContact(companyContact);
-        contractDataDto.setEmplateId(model.getContractTemplateId());
 
 
+        QueryWrapper<SealDictionary> queryWrapper=new QueryWrapper();
+        queryWrapper.eq("amos_company_seq",householdContract.getRegionalCompaniesSeq());
+        SealDictionary sealDictionary=sealDictionaryMapper.selectOne(queryWrapper);
+        contractDataDto.setCategory(sealDictionary.getCategory());
+        contractDataDto.setCompanyTenantName(sealDictionary.getCompanyTenantName());
+        contractDataDto.setCompanyUsername(sealDictionary.getSealedUser());
+        contractDataDto.setCompanyContact(sealDictionary.getSealedPhone());
+        List<Long> listSealId= new ArrayList<>();
+        listSealId.add(sealDictionary.getSealId());
+        contractDataDto.setSealId(listSealId);
+
         QueryWrapper<ContractTemplate> qu=new QueryWrapper();
         qu.eq("template_id",model.getContractTemplateId());
         ContractTemplate contractTemplate=contractTemplateMapper.selectOne(qu);
-
-
+        contractDataDto.setEmplateId(model.getContractTemplateId());
         contractDataDto.setCompanykeyword(contractTemplate.getCompanyKeyword());
         contractDataDto.setCompanyPage(contractTemplate.getCompanyPage());
         contractDataDto.setCompanyOffsetX(contractTemplate.getCompanyOffsetx());

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

@@ -182,6 +182,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         householdContract.setProjectAddressName(peasantHousehold.getProjectAddressName());
         householdContract.setPermanentAddressDetail(peasantHousehold.getPermanentAddressDetail());
         householdContract.setPermanentAddressName(peasantHousehold.getPermanentAddressName());
+        householdContract.setUserId(peasantHousehold.getUserId());
         householdContractServiceImpl.addHouseholdContract(householdContract);
 
         return peasantHousehold;

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

@@ -111,17 +111,13 @@ public class QiyuesuoServiceImpl {
       Integer personalPage= contractDataDto.getPersonalPage();
       Double  personalOffsetX= contractDataDto.getPersonalOffsetX();
       Double  personalOffsetY= contractDataDto.getPersonalOffsetY();
-
+      List<Long> corpSealIds=contractDataDto.getSealId();
       SdkClient sdkClient = new SdkClient(serverUrl, accessKey, accessSecret);
      // 合同基本参数
-
       //进行日期格式化
-
       Contract contract = new Contract();
       contract.setSubject(subject);
       contract.setDescription(subject);
-//      contract.setExpireTime(expireTime);
-//      contract.setEndTime(endTime);
       contract.setCategory(new Category(category));
       contract.setSend(false);
       // 个人
@@ -138,7 +134,8 @@ public class QiyuesuoServiceImpl {
       signatory2.setReceiver(new User(companyUsername, companyContact, "MOBILE"));
       signatory2.setSerialNo(2);
       Action action = new Action("COMPANY", 0);
-
+      //指定印章
+      action.setCorpSealIds(corpSealIds);
       signatory2.addAction(action);
       // 设置签署方
       contract.addSignatory(signatory1);
@@ -146,10 +143,7 @@ public class QiyuesuoServiceImpl {
 
       // 创建合同
       ContractDraftRequest request = new ContractDraftRequest(contract);
-
-
       logger.info("创建草稿合同调用前"+JSON.toJSONString(request));
-
       String response = sdkClient.service(request);
       SdkResponse<Contract> responseObj  = JSONUtils.toQysResponse(response, Contract.class);
      // 返回结果
@@ -161,7 +155,6 @@ public class QiyuesuoServiceImpl {
       } else {
           logger.info("请求失败，错误码:{}，错误信息:{}", responseObj.getCode(), responseObj.getMessage());
       }
-
       DocumentAddResult documentAddResult= this.getDocumentAddResult(result.getId(),subject, templateParam,emplateId);
       List<Signatory> list= result.getSignatories();
       Long ActionId=null;
@@ -194,7 +187,6 @@ public class QiyuesuoServiceImpl {
       stampers.add(stamper);
       stampers.add(stamper2);
       SdkResponse<Object>  data=  this.getSdkResponse(result.getId(), stampers);
-
       return result.getId();
   }
 
@@ -212,7 +204,6 @@ public class QiyuesuoServiceImpl {
         DocumentAddByTemplateRequest request = new DocumentAddByTemplateRequest(contractId,
                 emplateId , params, subject);
         logger.info("添加合同文档前", JSON.toJSONString(request));
-
         String response = sdkClient.service(request);
         SdkResponse<DocumentAddResult> responseObj = JSONUtils.toQysResponse(response, DocumentAddResult.class);
         logger.info("添加合同文档后", JSON.toJSONString(responseObj));
@@ -223,7 +214,6 @@ public class QiyuesuoServiceImpl {
         } else {
             throw new RuntimeException("请求失败");
         }
-
         return  result;
     }
 
@@ -243,8 +233,6 @@ public class QiyuesuoServiceImpl {
             throw new RuntimeException("请求失败");
         }
         return responseObj;
-
-
     }
 
 

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.SealDictionary;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.SealDictionaryMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.ISealDictionaryService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.SealDictionaryDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-23
+ */
+@Service
+public class SealDictionaryServiceImpl extends BaseService<SealDictionaryDto,SealDictionary,SealDictionaryMapper> implements ISealDictionaryService {
+    /**
+     * 分页查询
+     */
+    public Page<SealDictionaryDto> queryForSealDictionaryPage(Page<SealDictionaryDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<SealDictionaryDto> queryForSealDictionaryList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

@@ -121,11 +121,6 @@ qiyuesuo.serverUrl = https://openapi.qiyuesuo.cn
 qiyuesuo.accessKey = TdBmNkjAYd
 qiyuesuo.accessSecret = y8KiDFKKDdC9Ld9Cm5zuy2rpXjxP5Z
 
-qiyuesuo.category=智信能源科技有限公司光伏合同
-
-qiyuesuo.companyTenantName=智信能源科技有限公司
-qiyuesuo.companyUsername=吴文宝
-qiyuesuo.companyContact=13870935656
 # ============================================= v20230821 add properties =============================================
 security.productWeb=AMOS_STUDIO_WEB
 security.appKey=AMOS_STUDIO
@@ -138,7 +133,7 @@ hygfProgram.secret=3bfd098cfdac002126e728d2dbf83c0d
 farmer.orgCode=86
 farmer.sequenceNbr=1620981815542046722
 farmer.orgNamesWithoutRole=
-farmer.roleId=1693559312426758146
+farmer.roleId=1693501363645845505
 # 配置接口授权用户
 platform.access.loginId=hygf_platform
 platform.access.password=AC286A35E74D2DD281EB979789DECF3A

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

@@ -29,12 +29,8 @@ import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.IMonitorFanIndicator;
 import com.yeejoin.amos.component.robot.BadRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.velocity.runtime.directive.Break;
 import org.eclipse.paho.client.mqttv3.MqttException;
-import org.elasticsearch.common.recycler.Recycler;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -46,13 +42,10 @@ import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.alibaba.fastjson.JSON.parseArray;
 
 /**
  * @description:
@@ -937,6 +930,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                         map.put("title",listDatum.getEquipmentNumber());
                         map.put("windSpeed",listDatum.getValue());
                         map.put("power",listDatum.getValueLabel());
+                        //获取风机状态如果获取到的状态为空-则默认为正常运行状态
                         String fantStatus = ObjectUtils.isEmpty(fanstatutsHashMap.get(num))?"正常运行":fanstatutsHashMap.get(num);
                         map.put("url",fanStatusImagePathPrefix + File.separator + "风机-" + fantStatus + ".gif");
                         statusMaps.add(map);