Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/TanYinDataAcquisitionServiceImpl.java

@@ -224,7 +224,6 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
     @Scheduled (cron = "${dataRequestScheduled.tanYin}")
     @Async
     @Override
-    @PostConstruct
     public void stationList() {
         long ts = System.currentTimeMillis();
         log.info("-------碳银同步电站开始: {} ------- ", ts);
@@ -304,6 +303,7 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
             jpStation.setYearIncome(tanYinStationInfo.getYearPower() != null ? Double.parseDouble(tanYinStationInfo.getYearPower()) * 0.45 : 0.0);
             jpStation.setCumulativeIncome(tanYinStationInfo.getTotalPower() != null ? Double.parseDouble(tanYinStationInfo.getTotalPower()) * 0.45 : 0.0);
             jpStation.setArea(tanYinStationInfo.getArea());
+            jpStation.setState("在线");
             // jpStation.setEmail();
             // jpStation.setCreateTime();
             // jpStation.setRatedPower();

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 第三方场站
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "JpStationBatchDto", description = "第三方场站批量")
+public class JpStationBatchDto extends BaseDto {
+	private List<String> sequenceNbrList;
+	@ApiModelProperty("项目公司Code")
+	private String regionalCompaniesCode;
+	@ApiModelProperty("项目公司名称")
+	private String regionalCompaniesName;
+	@ApiModelProperty("经销商名称")
+	private String amosCompanyName;
+	@ApiModelProperty("经销商Code")
+	private String amosCompanyCode;
+}

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

@@ -866,7 +866,7 @@
                 and (amos_company_code is  not null and regional_companies_code is  not null )
             </if>
         </where>
-        order by rec_date DESC
+        order by sequence_nbr DESC
     </select>
 
     <select id="queryUnitInfo" resultType="java.util.Map">

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.config.DealerRestrict;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.DropDown;
+import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationBatchDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
@@ -891,6 +892,14 @@ public class JpStationController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/updateBatchCompanyCode")
+    @ApiOperation(httpMethod = "POST", value = "批量更新项目公司和经销商", notes = "批量更新项目公司和经销商")
+    public ResponseModel<?> updateBatchCompanyCode( @RequestBody JpStationBatchDto jpStationBatchDto) {
+        jpStationServiceImpl.updateBatchCompanyCode(jpStationBatchDto);
+        return ResponseHelper.buildResponse(null);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/queryStation")
     @ApiOperation(httpMethod = "POST", value = "查询场站", notes = "查询场站")
     public ResponseModel<?> queryStation(@RequestBody JpStationDto reviewDto) {

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

@@ -1150,4 +1150,15 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
         }
         return result;
     }
+
+    public void updateBatchCompanyCode(JpStationBatchDto jpStationBatchDto) {
+        if(CollectionUtil.isNotEmpty(jpStationBatchDto.getSequenceNbrList())){
+            LambdaUpdateWrapper<JpStation> wrapper =   new LambdaUpdateWrapper<>();
+            wrapper.set(JpStation::getRegionalCompaniesCode,jpStationBatchDto.getRegionalCompaniesCode())
+                    .set(JpStation::getAmosCompanyCode,jpStationBatchDto.getAmosCompanyCode())
+                    .in(JpStation::getSequenceNbr,jpStationBatchDto.getSequenceNbrList());
+            this.update(wrapper);
+        }
+
+    }
 }
\ No newline at end of file