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

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

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

@@ -246,6 +246,6 @@ public class HouseholdContract extends BaseEntity {
     private Date signingTime;
 
 
-    @TableField("user_id")
-    private String userId;
+    @TableField("project_user_id")
+    private String projectUserId;
 }

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

@@ -210,7 +210,7 @@ public class HouseholdContractController extends BaseController {
         householdContract.setDealerId(peasantHousehold.getDealerId());
         householdContract.setDealerCode(peasantHousehold.getDealerCode());
         householdContract.setDealerName(peasantHousehold.getDealerName());
-        householdContract.setPeasantHouseholdId(peasantHousehold.getSequenceNbr());
+        householdContract.setPeasantHouseholdId(peasantHousehold.getPeasantHouseholdId());
         householdContract.setRegionalCompaniesCode(peasantHousehold.getRegionalCompaniesCode());
         householdContract.setRegionalCompaniesName(peasantHousehold.getRegionalCompaniesName());
         householdContract.setRegionalCompaniesSeq(peasantHousehold.getRegionalCompaniesSeq());
@@ -219,7 +219,8 @@ public class HouseholdContractController extends BaseController {
         householdContract.setProjectAddressName(peasantHousehold.getProjectAddressName());
         householdContract.setPermanentAddressDetail(peasantHousehold.getPermanentAddressDetail());
         householdContract.setPermanentAddressName(peasantHousehold.getPermanentAddressName());
-        householdContract.setUserId(peasantHousehold.getUserId());
+        householdContract.setProjectUserId(peasantHousehold.getProjectUserId());
+        householdContract.setSurveyStatus(peasantHousehold.getSurveyStatus());
         householdContractServiceImpl.addHouseholdContract(householdContract);
 
         householdContractServiceImpl.reissueinitiateHouseholdContract(peasantHousehold,householdContract.getSequenceNbr());

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

@@ -72,7 +72,7 @@ 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() );
+        qw.eq(StringUtils.isNotEmpty(dto.getUserId()), "project_user_id",dto.getUserId() );
 
 
 

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

@@ -182,7 +182,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         householdContract.setProjectAddressName(peasantHousehold.getProjectAddressName());
         householdContract.setPermanentAddressDetail(peasantHousehold.getPermanentAddressDetail());
         householdContract.setPermanentAddressName(peasantHousehold.getPermanentAddressName());
-        householdContract.setUserId(peasantHousehold.getAmosUserId());
+        householdContract.setProjectUserId(peasantHousehold.getAmosUserId());
         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/PowerStationServiceImpl.java

@@ -148,6 +148,11 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
                     break;
                 case 法务审核:
                     powerStation.setBusinessStatus(resultObj.getName());
+
+                    if (VERIFY_RESULT_YES.equals(result)) {
+
+                    }
+
                     break;
                 case 文件审核:
                     if (VERIFY_RESULT_YES.equals(result)) {

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

@@ -946,6 +946,7 @@ public class CommonServiceImpl {
 
     @Scheduled(cron = "0 0/10 * * * ?")
     private void healthWarningMinuteByFJ() {
+        Date time = new Date();
         List<IdxBizFanPointProcessVariableClassificationDto> data = idxBizFanPointProcessVariableClassificationMapper.getInfluxDBData();
         Map<String, List<IdxBizFanPointProcessVariableClassificationDto>> maps = data.stream().collect(Collectors.groupingBy(IdxBizFanPointProcessVariableClassificationDto::getGatewayId));
         BoolQueryBuilder boolMustAll = QueryBuilders.boolQuery();
@@ -1041,6 +1042,8 @@ public class CommonServiceImpl {
                             BeanUtils.copyProperties(idxBizFanHealthIndex, obj);
                             idxBizFanHealthIndex.setHealthIndex(object.getDouble("indexValue"));
                             idxBizFanHealthIndex.setAnalysisObjSeq(obj.getSequenceNbr());
+                            idxBizFanHealthIndex.setRecDate(time);
+                            idxBizFanHealthIndex.setSequenceNbr(null);
                             idxBizFanHealthIndex.setRecDate(new Date());
                             //获取健康指数对应等级
                             LambdaQueryWrapper<IdxBizFanHealthLevel> query = new LambdaQueryWrapper<>();
@@ -1070,6 +1073,7 @@ public class CommonServiceImpl {
 
     @Scheduled(cron = "0 0/10 * * * ?")
     private void healthWarningMinuteByGF() {
+        Date time = new Date();
         List<IdxBizPvPointProcessVariableClassificationDto> data = idxBizPvPointProcessVariableClassificationMapper.getInfluxDBData();
         Map<String, List<IdxBizPvPointProcessVariableClassificationDto>> maps = data.stream().collect(Collectors.groupingBy(IdxBizPvPointProcessVariableClassificationDto::getGatewayId));
         BoolQueryBuilder boolMustAll = QueryBuilders.boolQuery();
@@ -1165,7 +1169,7 @@ public class CommonServiceImpl {
                             BeanUtils.copyProperties(idxBizFanHealthIndex, obj);
                             idxBizFanHealthIndex.setHealthIndex(object.getDouble("indexValue"));
                             idxBizFanHealthIndex.setAnalysisObjSeq(obj.getSequenceNbr());
-                            idxBizFanHealthIndex.setRecDate(new Date());
+                            idxBizFanHealthIndex.setRecDate(time);
                             //获取健康指数对应等级
                             LambdaQueryWrapper<IdxBizPvHealthLevel> query = new LambdaQueryWrapper<>();
                             query.eq(IdxBizPvHealthLevel::getAnalysisObjType, "设备");

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

@@ -62,7 +62,7 @@ public class HealthStatusIndicatorServiceImpl {
     private void healthWarningMinuteGF() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.HOUR_OF_DAY,calendar.get(Calendar.HOUR_OF_DAY)-1);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
         LambdaQueryWrapper<IdxBizPvHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizPvHealthIndex::getAnalysisType,"按时刻");
@@ -129,7 +129,7 @@ public class HealthStatusIndicatorServiceImpl {
     private void healthWarningHourGF() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.HOUR_OF_DAY,calendar.get(Calendar.HOUR_OF_DAY)-5);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
         LambdaQueryWrapper<IdxBizPvHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizPvHealthIndex::getAnalysisType,"按小时");
@@ -197,7 +197,7 @@ public class HealthStatusIndicatorServiceImpl {
     private void healthWarningDayGF() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)-3);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 
         LambdaQueryWrapper<IdxBizPvHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizPvHealthIndex::getAnalysisType,"按天");
@@ -259,7 +259,7 @@ public class HealthStatusIndicatorServiceImpl {
     private void healthWarningMinute() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.HOUR_OF_DAY,calendar.get(Calendar.HOUR_OF_DAY)-1);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
         LambdaQueryWrapper<IdxBizFanHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizFanHealthIndex::getAnalysisType,"按时刻");
@@ -326,7 +326,7 @@ public class HealthStatusIndicatorServiceImpl {
     private void healthWarningHour() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.HOUR_OF_DAY,calendar.get(Calendar.HOUR_OF_DAY)-5);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
         LambdaQueryWrapper<IdxBizFanHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizFanHealthIndex::getAnalysisType,"按小时");
@@ -394,7 +394,7 @@ public class HealthStatusIndicatorServiceImpl {
     private void healthWarningDay() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)-3);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 
         LambdaQueryWrapper<IdxBizFanHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizFanHealthIndex::getAnalysisType,"按天");