提交代码

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

@@ -182,7 +182,9 @@ public class HygfIcbcRecordDTO  {
     @ApiModelProperty (value = "代扣金额")
     private Double paymentAmount;
 
-
     @ApiModelProperty (value = "代扣时间")
     private String  paymentTime;
+
+    @ApiModelProperty (value = "银行卡类型")
+    private String type;
 }
\ 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/dto/HygfIcbcRecordQueryDTO.java

@@ -48,4 +48,6 @@ public class HygfIcbcRecordQueryDTO {
     private Integer offset;
 
     private List<String> ids;
+
+    private String type;
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.boot.module.hygf.api.dto
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/18 14:36
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class HygfIcbcSignProtocolDTO {
+
+    String phone;
+
+    String mediumId;
+
+    String verifyCode;
+
+    String sendNo;
+
+    String srVid;
+
+    boolean cancel=false;
+}

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

@@ -117,4 +117,7 @@ public class HygfIcbcRecord extends BaseEntity {
      */
     @TableField("amos_user_id")
     private String amosUserId;
+
+    @TableField("type")
+    private String type;
 }
\ No newline at end of file

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

@@ -103,6 +103,7 @@
         icbc.out_user_id as outUserId,
         icbc.protocol_status,
         icbc.medium_id,
+        icbc.type,
         ph.rec_date,
         ph.regional_companies_name as regionalCompaniesName,
         ph.regional_companies_code as regionalCompaniesCode,
@@ -142,6 +143,9 @@
             <if test="param.addressName != null and param.addressName != ''">
                 AND ph.project_address LIKE CONCAT('%', #{param.addressName}, '%')
             </if>
+            <if test="param.type != null and param.type != ''">
+                AND icbc.type LIKE CONCAT('%', #{param.type}, '%')
+            </if>
             <if test="param != null">
                 <if test="param.openAccountStatus != null and param.openAccountStatus != ''">
                     <if test="param.openAccountStatus != '00'">

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

@@ -4,10 +4,7 @@ import com.icbc.api.response.JftApiUserEntrustopenacctQueryResponseV1;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
-import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingRectificationOrderDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordDTO;
-import com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordQueryDTO;
+import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HygfIcbcServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
@@ -157,7 +154,34 @@ public class HygfIcbcController extends BaseController {
     @GetMapping(value = "/exportExcel")
     @UserLimits
     public void exportData( HttpServletResponse response,HygfIcbcRecordQueryDTO hygfIcbcRecordQueryDTO) {
-
         hygfIcbcService.exportExcel(response,hygfIcbcRecordQueryDTO);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(httpMethod = "GET",value = "签约代扣验证码",   notes = "签约代扣验证码")
+    @GetMapping(value = "/signVerifyCode")
+    public ResponseModel<Object> signVerifyCode(@RequestParam(required = true) String phone,@RequestParam(required = true) String mediumId ) {
+        return ResponseHelper.buildResponse( hygfIcbcService.signVerifyCode(phone,mediumId));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(httpMethod = "POST",value = "签约代扣协议",   notes = "签约代扣协议")
+    @PostMapping(value = "/signProtocol")
+    public ResponseModel<Object> signProtocol(@RequestBody HygfIcbcSignProtocolDTO hygfIcbcSignProtocolDTO){
+        return ResponseHelper.buildResponse(hygfIcbcService.signProtocol(hygfIcbcSignProtocolDTO));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(httpMethod = "GET",value = "查询代扣协议",   notes = "查询代扣协议")
+    @GetMapping(value = "/signQuery")
+    public ResponseModel<Object> signQuery(String busiCode){
+        return ResponseHelper.buildResponse(hygfIcbcService.signQuery(busiCode));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(httpMethod = "GET",value = "余额查询",   notes = "余额查询")
+    @GetMapping(value = "/balanceQuery")
+    public ResponseModel<Object> balanceQuery(String mediumId){
+        return ResponseHelper.buildResponse(hygfIcbcService.balanceQuery(mediumId));
+    }
 }

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

@@ -1048,6 +1048,7 @@ public class LargeScreenImpl {
 	// 全国场站功率和曲线
 
 	@Scheduled(cron = "0/10 * * * * ?")
+	@PostConstruct
 	public void getDetailsWindSpeedAlldataqgsh() {
 		getDetailsWindSpeedAlldataqg();
 	}
@@ -1099,16 +1100,28 @@ public class LargeScreenImpl {
 			activePowerListGF = indicatorDataMapper
 					.selectDataByequipmentIndexNameAndtimeqgNew(CommonConstans.taiheActivePowerPoint, gfGatewayIds);
 		}
-		System.out.println(JSON.toJSONString(activePowerListFD));
-		for (int i = 0; i < activePowerListFD.size(); i++) {
-			IndicatorData indicatorData = activePowerListFD.get(i);
-			IndicatorData indicatorData2 = activePowerListGF.get(i);
-			time.add(cn.hutool.core.date.DateUtil.format(indicatorData.getCreatedTime(), "HH:mm"));
+		System.out.println(JSON.toJSONString(activePowerListGF));
+		for (int i = 0; i < activePowerListGF.size(); i++) {
+			IndicatorData indicatorData =new IndicatorData();
+			indicatorData.setValueF(0.0f);
+			if(activePowerListFD.size()>i)
+			{
+				 indicatorData = activePowerListFD.get(i);
+			}else
+			{
+				//indicatorData.setValueF((float) (Math.random() * 5));
+			}
+			IndicatorData indicatorData2 =new IndicatorData();
+			indicatorData2.setValueF(0.0f);
+			if(activePowerListGF.size()>i)
+			{
+				indicatorData2 = activePowerListGF.get(i);
+			}
+			time.add(cn.hutool.core.date.DateUtil.format(indicatorData2.getCreatedTime(), "HH:mm"));
 			// Double vl= indicatorData.getValueF()+indicatorData2.getValueF() *
 			// CommonConstans.kwToMv;
 			Double vl = Double.valueOf(String.format(CommonConstans.Twodecimalplaces, indicatorData.getValueF()))
-					+ Double.valueOf(String.format(CommonConstans.Twodecimalplaces,
-					indicatorData2.getValueF() * CommonConstans.kwToMv));
+					+ Double.valueOf(String.format(CommonConstans.Twodecimalplaces, indicatorData2.getValueF() * CommonConstans.kwToMv));
 			values.add(String.format(CommonConstans.Twodecimalplaces, vl));
 		}