Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java

@@ -115,7 +115,8 @@ public class DingInfoPullController {
         String appSecret = "496f0f2a19994f76b4fd9dae087366c7";
         String appKey = "A331101453557202109017383";
         String method = "POST";
-        String secret = refreshTokenService.refreshToken(appKey,appSecret,govRequestTokenUrl,govRefreshTokenUrl,method);
+        String interfaceName = "5crv7i4727abLCv0";
+        String secret = refreshTokenService.refreshToken(appKey,appSecret,govRequestTokenUrl,govRefreshTokenUrl,interfaceName,method);
         log.info("secret :{}",secret);
         String sign = MD5.create().digestHex(appKey + secret + timestamp);
         HttpComponentsClientHttpRequestFactory factory = HttpUtil.generateHttpRequestFactory();
@@ -126,13 +127,12 @@ public class DingInfoPullController {
             restTemplate = new RestTemplate();
         }
         String appId = "A330000100000202105005790";
-        String updateTime = "2023-07-26 00:00:00";
-        String capCode = MD5.create().digestHex(timestamp + updateTime + appId);
+        String capCode = MD5.create().digestHex(timestamp + appId);
         String url = "https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/" +
                 "dataSharing/5crv7i4727abLCv0.htm?requestTime=" + timestamp +
                 "&sign=" + sign + "&appKey=" + appKey +
                 "&capCode=" + capCode + "&capTime=" + timestamp +
-                "&appId=" + appId + "&updateTime=" + updateTime;
+                "&appId=" + appId;
         log.info("url :{}",url);
         ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
         log.info(forEntity.getBody());
@@ -146,7 +146,8 @@ public class DingInfoPullController {
         String appSecret = "496f0f2a19994f76b4fd9dae087366c7";
         String appKey = "A331101453557202109017383";
         String method = "POST";
-        String secret = refreshTokenService.refreshToken(appKey,appSecret,govRequestTokenUrl,govRefreshTokenUrl,method);
+        String interfaceName = "3XN9R93Pva6db7sf";
+        String secret = refreshTokenService.refreshToken(appKey,appSecret,govRequestTokenUrl,govRefreshTokenUrl,interfaceName,method);
         log.info("secret :{}",secret);
         String sign = MD5.create().digestHex(appKey + secret + timestamp);
         HttpComponentsClientHttpRequestFactory factory = HttpUtil.generateHttpRequestFactory();
@@ -156,12 +157,42 @@ public class DingInfoPullController {
         }else{
             restTemplate = new RestTemplate();
         }
-        String appId = "A330000100000202105005790";
-        String updateTime = "2023-07-26 00:00:00";
-        String capCode = MD5.create().digestHex(timestamp + updateTime + appId);
+        String baseProjPrincipal = "蒋国海";
+        String baseProjSetYear = "2022";
+        String baseProjId = "331123220130969000000";
+        String baseManDeprt = "遂昌县大数据和金融发展中心";
+        String baseProjBasis = "2";
+        String baseLowestLevel = "C";
+        String ProjPrincipalCall = "13884366607";
+        //内容类别
+        String baseConstructionType = "01";
+        String baseProjType = "1";
+        String baseProjContacts = "毛以林";
+        String isEffective = "1";
+        String baseConsDeprtDing = "GO_9a7dce7fbaf54787998fa004f1b7c0e1";
+        String baseProjSetProg = "04";
+        String baseProjContactsCall = "13857049999";
+        String baseProjName = "遂昌县大数据和金融发展中心天工系统";
+        String baseProjConsClass = "C";
+        String areaCode = "331123000";
+        String baseAreaName = "遂昌县";
+        String baseManDeprtDing = "GO_9a7dce7fbaf54787998fa004f1b7c0e1";
+        String baseProvManDeprtDing = "GO_6c383c049d95461f9a0df780140ceb32";
+        String baseBasisEstablish = "中共遂昌县委办公室关于研究开发“天工”智能化管理平台（三期）的函";
+        String capCode = MD5.create().digestHex(timestamp + areaCode);
         String url = "https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/3XN9R93Pva6db7sf.htm?" +
                 "requestTime=" + timestamp + "&sign=" + sign +
-                "&appKey=" + appKey + "&baseProjPrincipal=abc&baseProjSetYear=abc&baseProjId=abc&baseManDeprt=abc&baseProjBasis=abc&baseLowestLevel=abc&ProjPrincipalCall=abc&baseConstructionType=abc&baseProjType=abc&baseProjContacts=abc&isEffective=abc&baseConsDeprtDing=abc&baseProjSetProg=abc&baseProjContactsCall=abc&baseProjName=abc&baseProjConsClass=abc&capCode=abc&baseManDeprtDing=abc&baseProvManDeprtDing=abc&baseBasisEstablish=abc&baseAreaCode=abc&capTime=abc&baseAreaName=abc";
+                "&appKey=" + appKey + "&baseProjPrincipal=" + baseProjPrincipal + "" +
+                "&baseProjSetYear=" + baseProjSetYear + "&baseProjId=" + baseProjId +
+                "&baseManDeprt=" + baseManDeprt + "&baseProjBasis=" + baseProjBasis +
+                "&baseLowestLevel=" + baseLowestLevel + "&ProjPrincipalCall=" + ProjPrincipalCall +
+                "&baseConstructionType=" + baseConstructionType + "&baseProjType=" + baseProjType +
+                "&baseProjContacts=" + baseProjContacts + "&isEffective=" + isEffective +
+                "&baseConsDeprtDing=" + baseConsDeprtDing + "&baseProjSetProg=" + baseProjSetProg +
+                "&baseProjContactsCall=" + baseProjContactsCall + "&baseProjName=" + baseProjName +
+                "&baseProjConsClass=" + baseProjConsClass + "&capCode=" + capCode + "&baseManDeprtDing=" + baseManDeprtDing +
+                "&baseProvManDeprtDing=" + baseProvManDeprtDing + "&baseBasisEstablish=" + baseBasisEstablish +
+                "&baseAreaCode=" + areaCode + "&capTime=" + timestamp + "&baseAreaName=" + baseAreaName;
         log.info("url :{}",url);
         ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
         log.info(forEntity.getBody());

pmapi/src/main/java/com/ningdatech/pmapi/performance/model/dto/PerformanceIndicatorProjectTemplateSaveDTO.java

@@ -34,6 +34,9 @@ public class PerformanceIndicatorProjectTemplateSaveDTO implements Serializable
     @ApiModelProperty("项目类型 ")
     private Integer projectType;
 
+    @ApiModelProperty("建设类型 1 软件、2 硬件、3 软硬件")
+    private Integer constructType;
+
     @ApiModelProperty("项目资金范围 1.500万元以下、2.500-2000万元，3.2000万元及以上")
     private Integer amountRange;
 

pmapi/src/main/java/com/ningdatech/pmapi/performance/model/dto/ProjectCoreBusinessDTO.java

@@ -6,6 +6,9 @@ import java.math.BigDecimal;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.Size;
 
 /**
  * @author CMM
@@ -24,18 +27,23 @@ public class ProjectCoreBusinessDTO implements Serializable {
     private String coreBusiness;
 
     @ApiModelProperty("业务指标分值")
+    @Range(min = 0, max = 10, message = "数值范围不正确,数值应大于0小于10")
     private BigDecimal score;
 
     @ApiModelProperty("业务指标名称")
+    @Size(max = 100)
     private String businessIndicatorName;
 
     @ApiModelProperty("业务指标描述")
+    @Size(max = 100)
     private String businessIndicatorDescription;
 
     @ApiModelProperty("指标设计依据")
+    @Size(max = 100)
     private String indexDesignBasis;
 
     @ApiModelProperty("指标计算方法")
+    @Size(max = 100)
     private String indexCalculationMethod;
 
     @ApiModelProperty("项目ID")

pmapi/src/main/java/com/ningdatech/pmapi/performance/model/dto/ProjectTemplateDetailDTO.java

@@ -3,6 +3,8 @@ package com.ningdatech.pmapi.performance.model.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -32,6 +34,7 @@ public class ProjectTemplateDetailDTO implements Serializable {
     private Long parentId;
 
     @ApiModelProperty("指标分值 3级指标才有")
+    @Range(min = 0, max = 100, message = "数值范围不正确,数值应大于0小于100")
     private BigDecimal indexScore;
 
     @ApiModelProperty("指标细则 3级指标才有")

pmapi/src/main/java/com/ningdatech/pmapi/performance/model/entity/ProjectCoreBusinessIndicators.java

@@ -38,23 +38,18 @@ public class ProjectCoreBusinessIndicators implements Serializable {
     private String coreBusiness;
 
     @ApiModelProperty("业务指标分值")
-    @Range(min = 0, max = 10, message = "数值范围不正确,数值应大于0小于10")
     private BigDecimal score;
 
     @ApiModelProperty("业务指标名称")
-    @Size(max = 100)
     private String businessIndicatorName;
 
     @ApiModelProperty("业务指标描述")
-    @Size(max = 100)
     private String businessIndicatorDescription;
 
     @ApiModelProperty("指标设计依据")
-    @Size(max = 100)
     private String indexDesignBasis;
 
     @ApiModelProperty("指标计算方法")
-    @Size(max = 100)
     private String indexCalculationMethod;
 
     @ApiModelProperty("项目ID")

pmapi/src/main/java/com/ningdatech/pmapi/performance/model/vo/ProjectTemplateDetailVO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -25,23 +26,26 @@ public class ProjectTemplateDetailVO implements Serializable {
     @ApiModelProperty("指标名称")
     private String name;
 
-    @ApiModelProperty("指标类型 0阶段 1一级指标 2二级指标 3三级指标")
+    @ApiModelProperty("指标类型 1一级指标 2二级指标 3三级指标")
     private Integer type;
 
     @ApiModelProperty("父级指标id")
     private Long parentId;
 
-    @ApiModelProperty("分数 3级指标才有")
-    private Integer score;
+    @ApiModelProperty("指标分值 3级指标才有")
+    private BigDecimal indexScore;
 
-    @ApiModelProperty("分数细则 3级指标才有")
-    private String scoreRubric;
+    @ApiModelProperty("指标细则 3级指标才有")
+    private String indexDetail;
 
-    @ApiModelProperty("评分pdf")
-    private String pdf;
+    @ApiModelProperty("评分细则")
+    private String gradeDetail;
 
-    @ApiModelProperty("阶段id")
-    private Long stageId;
+    @ApiModelProperty("佐证材料描述")
+    private String supportMaterial;
+
+    @ApiModelProperty("是否为附加指标")
+    private Boolean isAdditional;
 
     @ApiModelProperty("子指标")
     private List<ProjectTemplateDetailVO> children;

pmapi/src/main/java/com/ningdatech/pmapi/provincial/service/impl/JoinReviewProvincialBureauServiceImpl.java

@@ -67,6 +67,9 @@ public class JoinReviewProvincialBureauServiceImpl implements IJoinReviewProvinc
     @Value("${irs.province-gov.appKey}")
     private String govAppKey;
 
+    @Value("${irs.province-gov.interfaceName}")
+    private String interfaceName;
+
     /**
      * 推送/保存 重大接口到 省局联审
      * @return
@@ -152,7 +155,7 @@ public class JoinReviewProvincialBureauServiceImpl implements IJoinReviewProvinc
         String appSecret = govAppSecret;
         String appKey = govAppKey;
         String method = HttpMethod.POST.name();
-        String secret = refreshTokenService.refreshToken(appKey,appSecret,govRequestTokenUrl,govRefreshTokenUrl,method);
+        String secret = refreshTokenService.refreshToken(appKey,appSecret,govRequestTokenUrl,govRefreshTokenUrl,interfaceName,method);
         String sign = MD5.create().digestHex(appKey + secret + timeStamp * 1000);
         HttpComponentsClientHttpRequestFactory factory = HttpUtil.generateHttpRequestFactory();
         RestTemplate restTemplate;

pmapi/src/main/resources/application-dev.yml

@@ -227,6 +227,7 @@ irs:
   province-gov:
     can-search: false
     url: https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/62vd5jAdM0b7Gr00.htm
+    interfaceName: 62vd5jAdM0b7Gr00
     appSecret: 496f0f2a19994f76b4fd9dae087366c7
     appKey: A331101453557202109017383
   interface-refresh:

pmapi/src/main/resources/application-pre.yml

@@ -230,6 +230,7 @@ irs:
   province-gov:
     can-search: true
     url: https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/62vd5jAdM0b7Gr00.htm
+    interfaceName: 62vd5jAdM0b7Gr00
     appSecret: 496f0f2a19994f76b4fd9dae087366c7
     appKey: A331101453557202109017383
   interface-refresh:

pmapi/src/main/resources/application-prod.yml

@@ -229,6 +229,7 @@ irs:
     appKey: A331101453557202109017383
   province-gov:
     can-search: true
+    interfaceName: 62vd5jAdM0b7Gr00
     url: https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/62vd5jAdM0b7Gr00.htm
     appSecret: 496f0f2a19994f76b4fd9dae087366c7
     appKey: A331101453557202109017383

pmapi/src/test/java/com/ningdatech/pmapi/irs/irsTest3.java

@@ -65,7 +65,7 @@ public class irsTest3 extends AppTests {
         String appSecret = "496f0f2a19994f76b4fd9dae087366c7";
         String appKey = "A331101453557202109017383";
         String method = "POST";
-        String secret = refreshTokenService.refreshToken(appKey,appSecret,govRequestTokenUrl,govRefreshTokenUrl,method);
+        String secret = refreshTokenService.refreshToken(appKey,appSecret,govRequestTokenUrl,govRefreshTokenUrl,"1",method);
         String sign = CryptUtils.MD5Encode(appKey + secret + timestamp);
         HttpComponentsClientHttpRequestFactory factory = HttpUtil.generateHttpRequestFactory();
         RestTemplate restTemplate;

pmapi/src/test/resources/application-dev.yml

@@ -227,6 +227,7 @@ irs:
   province-gov:
     can-search: false
     url: https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/62vd5jAdM0b7Gr00.htm
+    interfaceName: 62vd5jAdM0b7Gr00
     appSecret: 496f0f2a19994f76b4fd9dae087366c7
     appKey: A331101453557202109017383
   interface-refresh:

pmapi/src/test/resources/application-pre.yml

@@ -230,6 +230,7 @@ irs:
   province-gov:
     can-search: true
     url: https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/62vd5jAdM0b7Gr00.htm
+    interfaceName: 62vd5jAdM0b7Gr00
     appSecret: 496f0f2a19994f76b4fd9dae087366c7
     appKey: A331101453557202109017383
   interface-refresh:

pmapi/src/test/resources/application-prod.yml

@@ -229,6 +229,7 @@ irs:
     appKey: A331101453557202109017383
   province-gov:
     can-search: true
+    interfaceName: 62vd5jAdM0b7Gr00
     url: https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/62vd5jAdM0b7Gr00.htm
     appSecret: 496f0f2a19994f76b4fd9dae087366c7
     appKey: A331101453557202109017383