Merge branch 'developer_bw' of…

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationDayGenerate.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author DELL
+ */
+@Data
+@TableName(value = "td_hygf_station_generate_day" ,autoResultMap = true)
+public class TdHYGFStationDayGenerate implements Serializable {
+    /**
+     * 创建时间
+     */
+    private Long createdTime;
+    /**
+     * 第三方场站id
+     */
+    private String thirdStationId;
+    /**
+     *日  yyyy-MM-dd
+     */
+    private String dayTime;
+    /**
+     *月  yyyy-MM
+     */
+    private String yearMonth;
+    /**
+     *时分 HH:mm
+     */
+    private String hour;
+    /**
+     * 发电量
+     */
+    private Double generate;
+    /**
+     * 满发小时数
+     */
+    private Double fullhour;
+    /**
+     * 收益
+     */
+    private Double income;
+
+
+    private String stationName; //名称
+    private String regionalCompaniesCode; //区域公司code
+    private String amosCompanyCode; //经销商code
+    private String stationState;//电站状态
+}
+

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFStationDayGenerateMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationDayGenerate;
+
+public interface TdHYGFStationDayGenerateMapper extends BaseMapper<TdHYGFStationDayGenerate> {
+}

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

@@ -104,7 +104,8 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
 	private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper;
 	@Autowired
 	private TdHYGFStationAllGenerateMapper TdHYGFStationAllGenerateMapper;
-
+	@Autowired
+	private HouseholdPvApiServiceImpl householdPvApiService;
 	@Autowired
 	private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
 	@Autowired
@@ -145,6 +146,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
 		List<String> stationIds = getStationIds();
 		String today = DateUtil.today();
 		String hour = new Date().getHours() + ":00";
+		String currentTime = DateUtil.format(new Date(), "HH:mm");
 		for (int i = 0; i < stationIds.size(); i++) {
 			try {
 				TimeUnit.SECONDS.sleep(1);
@@ -293,6 +295,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
 				if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate)) {
 					TdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
 				}
+				householdPvApiService.addTdHYGFStationDayGenerate(TdHYGFStationMonthGenerate,hour);
 				TdHYGFStationMonthGenerate.setThirdStationId(stationIds.get(i));
 				TdHYGFStationMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
 				TdHYGFStationMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));

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

@@ -91,6 +91,8 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
 	@Autowired
 	private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
 	@Autowired
+	private HouseholdPvApiServiceImpl householdPvApiService;
+	@Autowired
 	TdJpStationMapper tdJpStationMapper;
 
 	final static Logger logger = LoggerFactory.getLogger(GoodWeDataAcquisitionServiceImpl.class);
@@ -109,6 +111,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
 		// requestInfo.put("key", "龙虎山北区");
 		String today = DateUtil.today();
 		String hour = new Date().getHours() + ":00";
+		String currentTime = DateUtil.format(new Date(), "HH:mm");
 		List<GoodWeStationMonitorDto> goodWeStationLists = goodWeRequestUtil.getResPonseList(
 				GoodWeConstant.stationListStatusUrl, GoodWeConstant.requestPost, requestInfo,
 				GoodWeConstant.resovleRule_data_list, GoodWeStationMonitorDto.class);
@@ -247,7 +250,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
 				TdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
 				TdHYGFStationMonthGenerate.setStationName(jpStation.getName());
 				TdHYGFStationMonthGenerate.setStationState(jpStation.getState());
-
+				householdPvApiService.addTdHYGFStationDayGenerate(TdHYGFStationMonthGenerate,hour);
 				if (org.springframework.util.ObjectUtils.isEmpty(TdHYGFStationMonthGenerate.getCreatedTime())) {
 					TdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
 					TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);

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

@@ -48,11 +48,11 @@ public class HYGFThirdStationLogServiceImpl implements IHYGFThirdStationLogServi
 
     private void checkAndCreateNewTable(String tableName) {
         // 查询当前表的数量
-        Integer countTable = hygfThirdStationLogMapper.countTable(TABLE_NAME);
+        Integer countTable = hygfThirdStationLogMapper.countTable(TABLE_NAME + "%");
 
         // 如果表超过7个，删除最旧的表
-        if (countTable >= reserveDay) {
-            String oldestTableName = hygfThirdStationLogMapper.getOldestTableName(TABLE_NAME);
+        if (countTable > reserveDay) {
+            String oldestTableName = hygfThirdStationLogMapper.getOldestTableName(TABLE_NAME + "%");
             hygfThirdStationLogMapper.dropTable(oldestTableName);
         }
 

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

 package com.yeejoin.amos.api.householdapi.face.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.api.householdapi.face.model.HouseholdPvApiDto;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationDayGenerate;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationMonthGenerate;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.houseapi.HouseholdPvApiMapper;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HouseholdPvApi;
+import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationDayGenerateMapper;
 import com.yeejoin.amos.api.householdapi.face.service.IHouseholdPvApiService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,6 +27,10 @@ import java.util.List;
  */
 @Service
 public class HouseholdPvApiServiceImpl extends BaseService<HouseholdPvApiDto, HouseholdPvApi, HouseholdPvApiMapper> implements IHouseholdPvApiService {
+    @Autowired
+    public TdHYGFStationDayGenerateMapper TdHYGFStationDayGenerateMapper;
+
+
     /**
      * 分页查询
      */
@@ -30,4 +44,20 @@ public class HouseholdPvApiServiceImpl extends BaseService<HouseholdPvApiDto, Ho
     public List<HouseholdPvApiDto> queryForHouseholdPvApiList()   {
         return this.queryForList("" , false);
     }
+
+    public void addTdHYGFStationDayGenerate(TdHYGFStationMonthGenerate tdHYGFStationMonthGenerate,String currentTime){
+        TdHYGFStationDayGenerate tdHYGFStationDayGenerate = TdHYGFStationDayGenerateMapper.selectOne(
+                new QueryWrapper<TdHYGFStationDayGenerate>().eq("third_station_id", tdHYGFStationMonthGenerate.getThirdStationId())
+                        .eq("day_time", DateUtil.format(new Date(), "yyyy-MM-dd"))
+                        .eq("hour", currentTime)
+                        .eq("year_month", DateUtil.format(new Date(), "yyyy-MM")));
+        if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate)) {
+            tdHYGFStationDayGenerate = new TdHYGFStationDayGenerate();
+        }
+        BeanUtils.copyProperties(tdHYGFStationMonthGenerate,tdHYGFStationDayGenerate);
+        tdHYGFStationDayGenerate.setHour(currentTime);
+        tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
+        TdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
+    }
+
 }
\ No newline at end of file

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

@@ -120,7 +120,8 @@ public class ImasterDataServiceImpl implements ImasterDataService {
     private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
     @Autowired
     TdJpStationMapper tdJpStationMapper;
-    
+    @Autowired
+    private HouseholdPvApiServiceImpl householdPvApiService;
 	final static Logger logger = LoggerFactory.getLogger(GoLangDataAcquisitionServiceImpl.class);
 
 	final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -398,6 +399,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate)) {
                 TdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
             }
+
             TdHYGFStationMonthGenerate.setThirdStationId(jpStation.getThirdStationId());
             TdHYGFStationMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
             TdHYGFStationMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
@@ -409,7 +411,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             TdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             TdHYGFStationMonthGenerate.setStationName(jpStation.getName());
             TdHYGFStationMonthGenerate.setStationState(jpStation.getState());
-
+            householdPvApiService.addTdHYGFStationDayGenerate(TdHYGFStationMonthGenerate,hour);
             if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate.getCreatedTime())) {
                 TdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
                 TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);

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

@@ -114,7 +114,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 	private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
 	@Autowired
 	TdJpStationMapper tdJpStationMapper;
-
+	@Autowired
+	private HouseholdPvApiServiceImpl householdPvApiService;
 	final static Logger logger = LoggerFactory.getLogger(SofarDataAcquisitionServiceImpl.class);
 
 	final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -145,7 +146,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 		List<String> stationIds = kSolarStationMapper.getStationIds();
 		String today = DateUtil.today();
 		String hour = new Date().getHours() + ":00";
-
+		String currentTime = DateUtil.format(new Date(), "HH:mm");
 		for (String stationId : stationIds) {
 			LambdaQueryWrapper<KsolarStationList> wrapper = new LambdaQueryWrapper<>();
 			wrapper.eq(KsolarStationList::getStationId, stationId);
@@ -332,7 +333,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					TdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
 					TdHYGFStationMonthGenerate.setStationName(jpStation.getName());
 					TdHYGFStationMonthGenerate.setStationState(jpStation.getState());
-
+					householdPvApiService.addTdHYGFStationDayGenerate(TdHYGFStationMonthGenerate,hour);
 					if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate.getCreatedTime())) {
 						TdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
 						TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);

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

@@ -110,7 +110,8 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
 	private HYGFJPStationPowerHistoryMapper hygfjpStationPowerHistoryMapper;
 	@Autowired
 	private HYGFJPDayPowerMapper hygfjpDayPowerMapper;
-
+	@Autowired
+	private HouseholdPvApiServiceImpl householdPvApiService;
 	@Override
 	@Scheduled(cron = "${dataRequstScheduled.Sofar}")
 	public void stationList() {
@@ -178,8 +179,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
 
 	@Override
 	public void stationDetail(List<SofarStationList> list) {
-
-		// 业务表场站
+		String hour = new Date().getHours() + ":00";		// 业务表场站
 		List<JpStation> jpStations = jpStationMapper
 				.selectList(new QueryWrapper<JpStation>().eq("third_code", PVProducerInfoEnum.SH.getCode()));
 
@@ -488,7 +488,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
 					}
 
 					String today = DateUtil.today();
-					String hour = new Date().getHours() + ":00";
+
 					HYGFJPDayPower hygfjpDayPower = hygfjpDayPowerMapper.selectOne(
 							new QueryWrapper<HYGFJPDayPower>().eq("third_station_id", sunlightDto.getId().toString())
 									.eq("year_month_day", today).eq("hour", hour));
@@ -604,6 +604,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
 
 			);
 			TdHYGFStationMonthGenerate.setIncome(jpStation.getDayIncome());
+			householdPvApiService.addTdHYGFStationDayGenerate(TdHYGFStationMonthGenerate,hour);
 			if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate.getCreatedTime())) {
 				TdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
 				TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);

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

@@ -94,7 +94,8 @@ public class SunlightServiceImpl implements SunlightService {
 	final static Logger logger = LoggerFactory.getLogger(SofarDataAcquisitionServiceImpl.class);
 
 	final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
+	@Autowired
+	private HouseholdPvApiServiceImpl householdPvApiService;
 	// td电站信息存储
 	@Override
 	@Scheduled(cron = "${dataRequstScheduled.Sunlight}")
@@ -169,6 +170,7 @@ public class SunlightServiceImpl implements SunlightService {
 
 	// 电站数据如库，电站统计数据入库
 	public void stationDetail(JSONObject data) {
+		String hour = new Date().getHours() + ":00";
 		// 所有场站信息
 		List<SunlightDto> list = JSONArray.parseArray(JSON.toJSONString(data.get("pageList")), SunlightDto.class);
 
@@ -389,7 +391,7 @@ public class SunlightServiceImpl implements SunlightService {
 				jpStation.setYearIncome(js != null ? Double.valueOf(js.get(0).get("4") + "") / 1000 : null);
 
 				String today = DateUtil.today();
-				String hour = new Date().getHours() + ":00";
+
 				HYGFJPDayPower hygfjpDayPower = hygfjpDayPowerMapper.selectOne(
 						new QueryWrapper<HYGFJPDayPower>().eq("third_station_id", sunlightDto.getPs_id().toString())
 								.eq("year_month_day", today).eq("hour", hour));
@@ -497,7 +499,7 @@ public class SunlightServiceImpl implements SunlightService {
 			TdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
 			TdHYGFStationMonthGenerate.setStationName(jpStation.getName());
 			TdHYGFStationMonthGenerate.setStationState(jpStation.getState());
-
+			householdPvApiService.addTdHYGFStationDayGenerate(TdHYGFStationMonthGenerate,hour);
 			if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate.getCreatedTime())) {
 				TdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
 				TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);

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

@@ -162,7 +162,8 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
     private final static String pageNo = "1";
 
     private final static String pageSize = "999";
-
+    @Autowired
+    private HouseholdPvApiServiceImpl householdPvApiService;
     /**
      * 每隔 10分钟通过并网时间段同步碳银对应范围内的项目信息
      *
@@ -368,7 +369,7 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
             TdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             TdHYGFStationMonthGenerate.setStationName(jpStation.getName());
             TdHYGFStationMonthGenerate.setStationState(jpStation.getState());
-
+            householdPvApiService.addTdHYGFStationDayGenerate(TdHYGFStationMonthGenerate,hour);
             if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate.getCreatedTime())) {
                 TdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
                 TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/HygfRouthTypeEnum.java

 package com.yeejoin.amos.boot.module.hygf.api.Enum;
 
+import lombok.Getter;
+
 /**
  * 户用光伏业务类型枚举
  *
  * @author Administrator
  */
+@Getter
 public enum HygfRouthTypeEnum {
 
     /**
      * 业务类型枚举
      */
-    HYGF_REPAY("hygf_repayment", "还款"),
-    HYGF_DZKC("hygf_dzkc", "电站勘察"),
-    HYGF_DSG("hygf_dsg", "待施工"),
-    HYGF_HTTB("hygf_httb", "合同填报"),
+    HYGF_REPAY("hygf_repayment", "还款",10000L),
+    HYGF_DZKC("hygf_dzkc", "电站勘察",10001L),
+    HYGF_DSG("hygf_dsg", "待施工",10002L),
+    HYGF_HTFQ("hygf_htfq", "合同发起",10003L),
+    HYGF_HTQS("hygf_httb", "合同签署",10004L),
+    HYGF_HTGZ("hygf_httb", "合同盖章",10005L),
+    HYGF_XZFHD("fh_xzfhd", "新增发货单",10006L),
+    HYGF_XZPGD("hygf_xzfgd", "新增派工单",10007L),
+    HYGF_XZBWDJ("bw_xzbwdj", "新增并网登记",10008L),
+    HYGF_BWSJSH("bw_bwsjsh", "并网设计审核",10011L),
+    HYGF_BWGCSH("bw_bwgcsh", "并网工程审核",10012L),
+    HYGF_XZYSTJ("ys_xzystj", "新增验收提交",10009L),
+    HYGF_YSTRSH("bw_ystrsh", "验收投融审核",10013L),
+    HYGF_YSFWSH("bw_ysfwsh", "验收法务审核",10014L),
+    HYGF_XZTSRZ("hygf_xztsrz", "新增推送融资",10010L),
     ;
     private final String code;
 
     private final String name;
+    private final Long business;
 
-    HygfRouthTypeEnum(String code, String name) {
+    HygfRouthTypeEnum(String code, String name,Long business) {
         this.code = code;
         this.name = name;
+        this.business = business;
     }
 
     public static String getNameByType(String code) {

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/TaskTypeStationEnum.java

@@ -5,17 +5,15 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum  TaskTypeStationEnum {
     经销商审核("经销商审核", "经销商审核"),
-    电站勘察("电站勘察", "电站勘察"),
-    电站审核("电站审核", "电站审核"),
-    合同填报("合同填报", "合同填报"),
+    勘察("勘察", "勘察"),
+    合同("合同", "合同"),
     重置密码("重置密码", "重置密码"),
     设置管理员("设置管理员", "设置管理员"),
-    发货管理("发货管理", "发货管理"),
-    派工发料("派工发料", "派工发料"),
-    施工完工("施工完工", "施工完工"),
-    并网管理("并网管理", "并网管理"),
-    验收管理("验收管理", "验收管理"),
-    投融资管理("投融资管理", "投融资管理"),
+    发货("发货", "发货"),
+    施工("施工", "施工"),
+    并网("并网", "并网"),
+    验收("验收", "验收"),
+    投融资("投融资", "投融资"),
     还款("还款", "还款");
     /**
      * 名称，描述

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

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.data.annotation.Id;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+@Data
+@Accessors(chain = true)
+@TableName("td_hygf_station_generate_day")
+public class HourGenerate {
+    @Id
+    private Long createdTime;
+    /**
+     * 第三方电站id
+     */
+    @TableField("third_station_id")
+    private String thirdStationId;
+
+    /**
+     *  天
+     */
+    @TableField("day_time")
+    private String dayTime;
+    /**
+     *  时分
+     */
+    @TableField("hour")
+    private String hour;
+
+    /**
+     * 月份
+     */
+    @TableField("year_month")
+    private String yearMonth;
+    /**
+     * 发电量
+     */
+    @TableField("generate")
+    private Double generate;
+    /**
+     * 满发小时数
+     *
+     * */
+    @TableField("fullhour")
+    private Double fullhour;
+
+
+    @TableField("income")
+    // 日收益
+    private Double income;
+
+
+
+
+    @TableField("regional_companies_code")
+    private String regionalCompaniesCode;
+    @TableField("amos_company_code")
+    private String amosCompanyCode;
+    @TableField("station_name")
+    private String stationName;
+    @TableField("station_state")
+    private String stationState;
+
+
+
+
+
+
+
+
+
+
+
+}

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

@@ -36,4 +36,21 @@ public interface ToDoTasksMapper extends BaseMapper<ToDoTasks> {
      * @return
      */
     List<String> getTodoUserIdsByAmosDealer(@Param("companyOrgCode") String companyOrgCode, @Param("roleId") String roleId, @Param("amosDealerId") String amosDealerId);
+
+    /**
+     * 过滤用户根据管理端
+     * @param companyOrgCode
+     * @param userId
+     * @return
+     */
+    List<String> filterUsersByAdmin(@Param("companyOrgCode") String companyOrgCode, @Param("list") List<String> userId);
+
+    /**
+     * 过滤用户根据经销商端
+     * @param companyOrgCode
+     * @param amosDealerCode
+     * @param userId
+     * @return
+     */
+    List<String> filterUsersByAmosDealer(@Param("companyOrgCode") String companyOrgCode, @Param("amosDealerCode") String amosDealerCode, @Param("list") List<String> userId);
 }

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

@@ -21,4 +21,6 @@ public interface WorkOrderPowerStationMapper extends BaseMapper<WorkOrderPowerSt
     List<Map<String, Object>> getSgCreateTime();
 
     List<Map<String, Object>> getSgEndTime();
+
+    String getStationName(@Param("workOrderId") Long workOrderId);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/HourGenerateMapper.java

+package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PowerCurveDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+public interface HourGenerateMapper extends BaseMapper<DayGenerate> {
+
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<PowerCurveDto>  getHourGeneratqx(@Param("date") String date,@Param("regionalCompaniesCode") String regionalCompaniesCode, @Param("amosCompanyCode") String amosCompanyCode, @Param("stationType") String stationType,  @Param("thirdStationId") String thirdStationId,@Param("dto")List<String> statioId);
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/MonthPowerMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerCurveDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AllPower;
 import com.yeejoin.amos.boot.module.hygf.api.entity.MonthPower;
@@ -30,7 +31,7 @@ public interface MonthPowerMapper extends BaseMapper<MonthPower> {
     List<PowerCurveDto> getYearPower(@Param("date") String month,@Param("dto")List<String> statioId);
 
     List<PowerCurveDto> getAllPower(@Param("date") String month,@Param("dto")List<String> statioId);
-
-    List<PowerCurveDto>  getDayPowercount(@Param("date") String month,@Param("dto")List<String> statioId,@Param("thirdStationId") String thirdStationId);
+    @UserEmpower(field = {"regional_companies_code"}, dealerField = {"amos_company_code", "regional_companies_code"}, fieldConditions = {"eq", "in"}, relationship = "and")
+    List<PowerCurveDto>  getDayPowercount(@Param("date") String month,@Param("regionalCompaniesCode") String regionalCompaniesCode, @Param("amosCompanyCode") String amosCompanyCode,@Param("dto")List<String> statioId,@Param("thirdStationId") String thirdStationId);
 
 }

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

@@ -52,4 +52,27 @@
 
         GROUP BY amos_user_id
     </select>
+
+    <select id="filterUsersByAdmin" resultType="java.lang.String">
+        SELECT amos_user_id FROM  std_user_empower sue
+        where (sue.amos_org_code like #{companyOrgCode} or sue.amos_org_code like '%all%')
+        and sue.permission_type='HYGF'
+        and amos_user_id in
+        <foreach item="item" collection="ids" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+        GROUP BY amos_user_id
+    </select>
+
+    <select id="filterUsersByAmosDealer" resultType="java.lang.String">
+        SELECT amos_user_id FROM std_user_biz sub
+        LEFT JOIN hygf_personnel_business hpb ON hpb.foundation_id=sub.sequence_nbr
+        where sub.amos_dealer_code = #{amosDealerCode}
+            and hpb.regional_companies_code like #{companyOrgCode}
+            and amos_user_id in
+            <foreach item="item" collection="ids" separator="," open="(" close=")" index="">
+                #{item}
+            </foreach>
+        GROUP BY amos_user_id
+    </select>
 </mapper>

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

@@ -31,5 +31,11 @@
         WHERE power_station_construction_status='已完工'
     </select>
 
+    <select id="getStationName" resultType="java.lang.String">
+        SELECT GROUP_CONCAT(hph.owners_name)  from hygf_work_order_power_station hwops
+        LEFT JOIN hygf_peasant_household hph on hph.sequence_nbr=hwops.peasant_household_id
+        WHERE hwops.work_order_id =#{workOrderId}
+    </select>
+
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/HourGenerateMapper.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.hygf.api.tdenginemapper.HourGenerateMapper">
+    <select id="getHourGeneratqx"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerCurveDto">
+        SELECT
+        sum(generate)num,
+        `hour` date
+        FROM house_pv_data.td_hygf_station_generate_day
+        <where>
+            <if test="dto!=null">
+                third_station_id in
+                <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
+                and regional_companies_code = #{regionalCompaniesCode}
+            </if>
+            <if test="amosCompanyCode!=null and amosCompanyCode != ''">
+                and amos_company_code = #{amosCompanyCode}
+            </if>
+            <if test="stationType!=null and stationType != ''">
+                and stationType = #{stationType}
+            </if>
+            <if test="thirdStationId!=null and thirdStationId != ''">
+                and third_station_id = #{thirdStationId}
+            </if>
+            and day_time = #{date}
+        </where>
+        GROUP BY `hour`
+    </select>
+
+</mapper>

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

@@ -90,12 +90,17 @@
             <if test="thirdStationId!=null and thirdStationId != ''">
                 and third_station_id = #{thirdStationId}
             </if>
+            <if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
+                and regional_companies_code = #{regionalCompaniesCode}
+            </if>
+            <if test="amosCompanyCode!=null and amosCompanyCode != ''">
+                and amos_company_code = #{amosCompanyCode}
+            </if>
+            <if test="date!=null and date != ''">
+               and year_month_day = #{date}
+            </if>
         </where>
 
-
-
-
-        and year_month_day = #{date}
         GROUP BY `hour`
     </select>
 

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

@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.HygfRouthTypeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.*;
@@ -204,9 +204,13 @@ public class HouseholdContractController extends BaseController {
         householdContrac.setStatus(HouseholdContractEnum.合同状态_农户已签署.getCode());
 
         //生成填报任务
-        ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContrac.getSequenceNbr(), "用户"+householdContrac.getPartyA()+"合同盖章", householdContrac.getRegionalCompaniesCode());
-        List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(null, engineering);
-        toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds, toDoTasks);
+        RouthPathVO routhPathVO = new RouthPathVO();
+        routhPathVO.setRouthPathId(String.valueOf(householdContrac.getSequenceNbr()));
+        String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTGZ.getCode(), routhPathVO);
+        String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTGZ.getCode(), routhPathVO);
+        ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), householdContrac.getSequenceNbr(), householdContrac.getPartyA()+"待合同盖章", householdContrac.getRegionalCompaniesCode(),routhPath,wxRouthPath);
+        List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(householdContrac.getRegionalCompaniesCode(), engineering);
+        toDoTasksServiceImpl.completeAndAddToDoTask(todoUserIds, toDoTasks,"");
 
         return ResponseHelper.buildResponse(householdContractServiceImpl.updateById(householdContrac));
     }
@@ -236,9 +240,16 @@ public class HouseholdContractController extends BaseController {
                 peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
                 peasantHouseholdServiceImpl.getBaseMapper().updateById(peasantHousehold);
             System.out.println("更新成功"+householdContrac.getPeasantHouseholdId());
-
+            //生成发货待办
+            RouthPathVO routhPathVO = new RouthPathVO();
+            String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getCode(), routhPathVO);
+            String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getCode(), routhPathVO);
+            ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.发货.getCode(),  HygfRouthTypeEnum.HYGF_XZFHD.getBusiness(),   peasantHousehold.getOwnersName()+"待新增发货单",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
+            String roleId = toDoTasksServiceImpl.getRoleIdByName("户用光伏-仓储");
+            List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
+            toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
         }
-        ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContrac.getSequenceNbr());
+        ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), householdContrac.getSequenceNbr());
         toDoTasksServiceImpl.completeToDoTasks(toDoTasks,"");
 
         }catch (Exception e){
@@ -265,7 +276,7 @@ public class HouseholdContractController extends BaseController {
         householdContrac=  householdContractServiceImpl.getById(sequenceNbr);
         householdContrac.setStatus(HouseholdContractEnum.合同状态_已作废.getCode());
         LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.合同填报.getCode());
+        wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.合同.getCode());
         wrapper.eq(ToDoTasks::getState, "待办");
         wrapper.eq(ToDoTasks::getBusinessId, householdContrac.getSequenceNbr());
         List<ToDoTasks> doTasks= toDoTasksMapper.selectList(wrapper);

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

@@ -383,6 +383,7 @@ public class JpStationController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "工率曲线", notes = "电站监控电量收益")
     @GetMapping(value = "/getPowerqx")
+    @UserLimits
     public ResponseModel<Map<String, List<Object>>> getPowerqx(JpStationDto reviewDto, String date, String type) {
         //获取当前人管理场站
         List<String> data = new ArrayList();
@@ -795,6 +796,7 @@ public class JpStationController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "发电量曲线", notes = "发电量曲线")
     @GetMapping(value = "/getGenerateqx")
+    @UserLimits
     public ResponseModel<Map<String, List<Object>>> getGenerateqx(JpStationDto reviewDto, String date, String type) {
 
         Map<String, List<Object>> map = jpStationServiceImpl.getGenerateqx(date, type, reviewDto);
@@ -806,6 +808,7 @@ public class JpStationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "工率曲线", notes = "电站监控电量收益")
     @GetMapping(value = "/getPowerqxnew")
+    @UserLimits
     public ResponseModel<Map<String, List<Object>>> getPowerqxnew(JpStationDto reviewDto, String date) {
 
         Map<String, List<Object>> map = jpStationServiceImpl.getPowerqxnew(date, reviewDto);

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

@@ -15,10 +15,10 @@ import com.qiyuesuo.sdk.v2.response.MiniappTicketResult;
 import com.qiyuesuo.sdk.v2.response.SdkResponse;
 import com.qiyuesuo.sdk.v2.utils.Algorithm;
 import com.qiyuesuo.sdk.v2.utils.Base64Utils;
-import com.qiyuesuo.sdk.v2.utils.CollectionUtils;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.HygfRouthTypeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.CallbackDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
@@ -28,6 +28,7 @@ import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServi
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PeasantHouseholdServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ToDoTasksServiceImpl;
+import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -193,9 +194,13 @@ public class QiyuesuoController extends BaseController {
 				wrapper4.eq(HouseholdContract::getContractLockId, CallbackDto.getContractId());
 				HouseholdContract householdContrac = householdContractMapper.selectOne(wrapper4);
 				// 生成填报任务
-				ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContrac.getSequenceNbr(), "用户" + householdContrac.getPartyA() + "合同盖章", householdContrac.getRegionalCompaniesCode());
-				List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(null, engineering);
-				toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds, toDoTasks);
+				RouthPathVO routhPathVO = new RouthPathVO();
+				routhPathVO.setRouthPathId(String.valueOf(householdContrac.getSequenceNbr()));
+				String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTGZ.getCode(), routhPathVO);
+				String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTGZ.getCode(), routhPathVO);
+				ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), householdContrac.getSequenceNbr(),  householdContrac.getPartyA() + "待合同盖章", householdContrac.getRegionalCompaniesCode(),routhPath,wxRouthPath);
+				List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(householdContrac.getRegionalCompaniesCode(), engineering);
+				toDoTasksServiceImpl.completeAndAddToDoTask(todoUserIds, toDoTasks,"");
 			} else if ("SEAL".equals(CallbackDto.getCallbackType())) {
 
 				LambdaUpdateWrapper<HouseholdContract> wrapper = new LambdaUpdateWrapper<>();
@@ -217,8 +222,16 @@ public class QiyuesuoController extends BaseController {
 					peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
 					peasantHouseholdServiceImpl.getBaseMapper().updateById(peasantHousehold);
 					logger.info("更新成功");
+					//生成发货待办
+					RouthPathVO routhPathVO = new RouthPathVO();
+					String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getCode(), routhPathVO);
+					String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getCode(), routhPathVO);
+					ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.发货.getCode(),  HygfRouthTypeEnum.HYGF_XZFHD.getBusiness(),   peasantHousehold.getOwnersName()+"待新增发货单",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
+					String roleId = toDoTasksServiceImpl.getRoleIdByName("户用光伏-仓储");
+					List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
+					toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
 				}
-				ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), contract.getSequenceNbr());
+				ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), contract.getSequenceNbr());
 				toDoTasksServiceImpl.completeToDoTasks(toDoTasks,"");
 			}
 			try {

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

@@ -93,7 +93,7 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
                 routhPathVO.setRouthPathId(String.valueOf(dealerReview.getUnitInfoId()));
                 String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.经销商审核.getCode(),dealerReview.getNextProcessNode(), routhPathVO);
                 String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.经销商审核.getCode(),dealerReview.getNextProcessNode(), routhPathVO);
-                ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.经销商审核.getCode(), dealerReview.getUnitInfoId(), "经销商"+ name +"待经销商审核", regionalCompaniesCode, routhPath,wxRouthPath);
+                ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.经销商审核.getCode(), dealerReview.getUnitInfoId(), name +"待审核", regionalCompaniesCode, routhPath,wxRouthPath);
                 String roleId = toDoTasksService.getRoleIdByName("户用光伏-管理员");
                 List<String> todoUserIds = toDoTasksService.getTodoUserIds(null, roleId);
                 toDoTasksService.addToDoTasksByUserIds(todoUserIds, toDoTasks);

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

@@ -4,12 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -22,7 +20,6 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingAuditingDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingInfoDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingInfoMapper;
@@ -39,13 +36,11 @@ import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.annotation.Resource;
-import java.math.BigInteger;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -224,20 +219,22 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
                     financingAuditingDto.setPeasantHouseholdId(Long.valueOf(e));
                     financingAuditingDto.setPromoter(RequestContext.getExeUserId());
                     financingAuditingService.createWithModel(financingAuditingDto);
+                    //完成新增投融
+                    ToDoTasks toDoTasks1=  new ToDoTasks (TaskTypeStationEnum.投融资.getCode(),HygfRouthTypeEnum.HYGF_XZTSRZ.getBusiness());
+                    toDoTasksService.completeToDoTasks(toDoTasks1,"");
                     //发起待办
-                    String taskName="您有一条验收的待办";
-                    String orgCode="";
+                    String taskName="您有一条投融的待办";
                     if(Objects.nonNull(peasantHousehold)){
-                        taskName="电站名称" + peasantHousehold.getOwnersName() + "有一条投融资状态为" +FinancingAuditEnum.待融资审核.getName() + "待办" ;
-                        orgCode=peasantHousehold.getRegionalCompaniesCode();
+                        taskName= peasantHousehold.getOwnersName() +"待融资审核" ;
                     }
                     RouthPathVO routhPathVO = new RouthPathVO();
                     routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
-                    String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
-                    String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
-                    ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.投融资管理.getCode(),  peasantHousehold.getSequenceNbr(),  taskName, orgCode,routhPath,wxRouthPath);
+                    String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
+                    String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
+                    ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.投融资.getCode(),  peasantHousehold.getSequenceNbr(),  taskName, model.getFinancingCompaniesCode(),routhPath,wxRouthPath);
                     List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
-                    toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks);
+                    List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.投融资.getCode(), workflowResultDto.getNextNodeKey(),userIds, model.getFinancingCompaniesCode(), peasantHousehold.getDeveloperCode());
+                    toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks);
                 }
                 //批量 兼容审核不通过及整改待推送
                 else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals("待推送")   ){
@@ -287,7 +284,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
 
             this.deleteBySeq(financingInfo.getSequenceNbr());
             //停止流程
-            ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.投融资管理.getCode(), financingInfo.getPeasantHouseholdId());
+            ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.投融资.getCode(), financingInfo.getPeasantHouseholdId());
             toDoTasksService.completeToDoTasks(toDoTasks,"");
         }
 
@@ -377,16 +374,17 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         String taskName="您有一条投融资的待办";
         String orgCode="";
         if(Objects.nonNull(peasantHousehold)){
-            taskName="电站名称" + peasantHousehold.getOwnersName() + "流程流转到" +workflowResultDto.getNextNodeName() + "需待办" ;
+            taskName=peasantHousehold.getOwnersName() + "待" +workflowResultDto.getNextNodeName() ;
             orgCode=peasantHousehold.getRegionalCompaniesCode();
         }
         RouthPathVO routhPathVO = new RouthPathVO();
         routhPathVO.setRouthPathId(String.valueOf(financingAuditing.getPeasantHouseholdId()));
-        String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
-        String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
-        ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.投融资管理.getCode(),  peasantHousehold.getSequenceNbr(),   taskName,orgCode,routhPath,wxRouthPath);
+        String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
+        String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
+        ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.投融资.getCode(),  peasantHousehold.getSequenceNbr(),   taskName,orgCode,routhPath,wxRouthPath);
         List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
-        toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks,"");
+        List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.投融资.getCode(), workflowResultDto.getNextNodeKey(),userIds, orgCode, peasantHousehold.getDeveloperCode());
+        toDoTasksService.completeAndAddToDoTask(filterUsers,toDoTasks,"");
         //节点为待整改时生成整改单
         if (params.containsKey("isFlag") && params.get("isFlag").equals("1") && workflowResultDto.getNextNodeKey().equals(FinancingAuditEnum.待整改.getCode())) {
              if (params.containsKey("isHistory")){

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

@@ -33,6 +33,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.nio.charset.StandardCharsets;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;

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

@@ -9,12 +9,14 @@ import com.github.pagehelper.PageInfo;
 import com.qiyuesuo.sdk.v2.bean.User;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.HygfRouthTypeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IHouseholdContractService;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
+import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -247,9 +249,13 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         householdContractMapper.updateById(householdContract);
         //创建农户待办
 
-        ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户" + householdContract.getPartyA() + "的合同填写", householdContract.getDealerCode());
+        RouthPathVO routhPathVO = new RouthPathVO();
+        routhPathVO.setRouthPathId(String.valueOf(householdContract.getSequenceNbr()));
+        String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTQS.getCode(), routhPathVO);
+        String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTQS.getCode(), routhPathVO);
+        ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), householdContract.getSequenceNbr(),  householdContract.getPartyA() + "待合同签署", householdContract.getDealerCode(),routhPath,wxRouthPath);
         PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
-        toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getAmosUserId(), toDoTasks1, "任务明细：合同发起成功");
+        toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getAmosUserId(), toDoTasks1, "");
         return householdContract;
 
     }
@@ -387,9 +393,13 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         householdContractMapper.updateById(householdContract);
 
         //生成填报任务
-        ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户" + householdContract.getPartyA() + "的合同填写", householdContract.getDealerCode());
+        RouthPathVO routhPathVO = new RouthPathVO();
+        routhPathVO.setRouthPathId(String.valueOf(householdContract.getSequenceNbr()));
+        String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTQS.getCode(), routhPathVO);
+        String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTQS.getCode(), routhPathVO);
+        ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), householdContract.getSequenceNbr(), householdContract.getPartyA() + "待合同签署", householdContract.getDealerCode(),routhPath,wxRouthPath);
         PeasantHousehold peasan = peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
-        toDoTasksServiceImpl.addToDoTasksByUserId(peasan.getAmosUserId(), toDoTasks1, "任务明细：合同发起成功");
+        toDoTasksServiceImpl.addToDoTasksByUserId(peasan.getAmosUserId(), toDoTasks1, "");
 
 
         return householdContract;

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

@@ -21,10 +21,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.JpInverterMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IJpStationService;
-import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.DayGenerateMapper;
-import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthGenerateMapper;
-import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthPowerMapper;
-import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.YearGenerateMapper;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.*;
 import org.apache.activemq.util.MapHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -67,6 +64,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
     @Autowired
     DayGenerateMapper dayGenerateMapper;
     @Autowired
+    HourGenerateMapper hourGenerateMapper;
+    @Autowired
     MonthGenerateMapper monthGenerateMapper;
     @Autowired
     YearGenerateMapper yearGenerateMapper;
@@ -122,7 +121,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
 
             if(type.equals("day")){
                 map= gethourList();
-                data =monthPowerMapper.getDayPowercount(date, statioId,null);
+                data =monthPowerMapper.getDayPowercount(date,null,null, statioId,null);
             }else if(type.equals("month")){
                 map= getDayListOfMonth(date);
                 data=monthPowerMapper.getMonthPower(date, statioId);
@@ -242,8 +241,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
         Map<String, List<Object>> map = new HashMap<>();
         Map<String, List<Object>> map1 = new HashMap<>();
         try {
-
-            if(type.equals("month")){
+            if(type.equals("day")){
+                map= gethourList();
+                listx =map.get("x");
+                data =hourGenerateMapper.getHourGeneratqx(date,reviewDto.getRegionalCompaniesCode(), reviewDto.getAmosCompanyCode(), reviewDto.getStationType(),reviewDto.getThirdStationId(), null);
+//                }
+            }else if(type.equals("month")){
                 map= getDayListOfMonth(reviewDto.getTimeDateMonth());
 //                if(statioId!=null&&!statioId.isEmpty()) {
 
@@ -291,7 +294,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
     @Override
     @UserLimits
     public Map<String, List<Object>> getPowerqxnew(String date,JpStationDto reviewDto) {
+        if (StringUtils.isEmpty(date)){
             date = DateUtil.format(new Date(), "yyyy-MM-dd");
+        }
      //   List<String> statioId=new ArrayList();
 //        List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
 //        for (JpStation jpStation : dataJpStation) {
@@ -302,7 +307,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
         List<Object> listy =new ArrayList<>();
         Map<String, List<Object>> map =new HashMap<>();
         map= gethourList();
-        data =monthPowerMapper.getDayPowercount(date, null,reviewDto.getThirdStationId());
+        data =monthPowerMapper.getDayPowercount(date,null,null, null,reviewDto.getThirdStationId());
         listx =map.get("x");
         listy =map.get("y");
         if(data!=null&&!data.isEmpty()){

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

@@ -2,30 +2,24 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
-import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPeasantHouseholdService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IWxService;
-import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -33,7 +27,6 @@ import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.*;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
-import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -204,12 +197,16 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         todoUserIds.add(peasantHousehold.getDeveloperUserId());
         RouthPathVO routhPathVO = new RouthPathVO();
         routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
-        String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.电站勘察.getCode(),HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
-        String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.电站勘察.getCode(),HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
-        ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.电站勘察.getCode(),  peasantHousehold.getSequenceNbr(),   "用户"+householdContract.getPartyA()+"电站信息勘察",householdContract.getDealerCode(),routhPath,wxRouthPath);
+        String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.勘察.getCode(),HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
+        String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.勘察.getCode(),HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
+        ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.勘察.getCode(),  peasantHousehold.getSequenceNbr(),   householdContract.getPartyA()+"待勘察",householdContract.getDealerCode(),routhPath,wxRouthPath);
         toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
 
-        ToDoTasks toDoTasks1=  new ToDoTasks (TaskTypeStationEnum.合同填报.getCode(),  householdContract.getSequenceNbr(),  "用户"+householdContract.getPartyA()+"的合同待发起",householdContract.getDealerCode());
+        RouthPathVO routhPathVO1 = new RouthPathVO();
+        routhPathVO1.setRouthPathId(String.valueOf(householdContract.getSequenceNbr()));
+        String routhPath1 = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO);
+        String wxRouthPath1 = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO);
+        ToDoTasks toDoTasks1=  new ToDoTasks (TaskTypeStationEnum.合同.getCode(),  householdContract.getSequenceNbr(),  householdContract.getPartyA()+"待合同发起",householdContract.getDealerCode(),routhPath1,wxRouthPath1);
         toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
         return model;
     }
@@ -965,16 +962,16 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         todoUserIds.add(peasantHousehold.getDeveloperUserId());
         RouthPathVO routhPathVO = new RouthPathVO();
         routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
-        String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.电站勘察.getCode(), HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
-        String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.电站勘察.getCode(), HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
-        ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.电站勘察.getCode(),  peasantHousehold.getSequenceNbr(),   "用户"+householdContract.getPartyA()+"电站信息勘察",householdContract.getDealerCode(),routhPath,wxRouthPath);
+        String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.勘察.getCode(), HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
+        String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.勘察.getCode(), HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
+        ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.勘察.getCode(),  peasantHousehold.getSequenceNbr(),   householdContract.getPartyA()+"待勘察",householdContract.getDealerCode(),routhPath,wxRouthPath);
         toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
 
         RouthPathVO routhPathVO1 = new RouthPathVO();
-        routhPathVO1.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
-        String routhPath1 = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同填报.getCode(), HygfRouthTypeEnum.HYGF_HTTB.getCode(), routhPathVO1);
-        String wxRouthPath1 = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同填报.getCode(), HygfRouthTypeEnum.HYGF_HTTB.getCode(), routhPathVO1);
-        ToDoTasks toDoTasks1=  new ToDoTasks (TaskTypeStationEnum.合同填报.getCode(),  householdContract.getSequenceNbr(),  "用户"+householdContract.getPartyA()+"的合同待发起",householdContract.getDealerCode(),routhPath1,wxRouthPath1);
+        routhPathVO1.setRouthPathId(String.valueOf(householdContract.getSequenceNbr()));
+        String routhPath1 = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO);
+        String wxRouthPath1 = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO);
+        ToDoTasks toDoTasks1=  new ToDoTasks (TaskTypeStationEnum.合同.getCode(),  householdContract.getSequenceNbr(),  householdContract.getPartyA()+"待合同发起",householdContract.getDealerCode(),routhPath1,wxRouthPath1);
         toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
 
 

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -10,7 +9,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
-import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
@@ -27,11 +25,9 @@ import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.BooleanUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
@@ -229,20 +225,21 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 				PeasantHousehold peasantHousehold = peasantHouseholdService.getById(powerStation.getPeasantHouseholdId());
 				RouthPathVO routhPathVO = new RouthPathVO();
 				routhPathVO.setRouthPathId(String.valueOf(powerStation.getSequenceNbr()));
-				String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.电站审核.getCode(),powerStation.getNextProcessNode(), routhPathVO);
-				String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.电站审核.getCode(),powerStation.getNextProcessNode(), routhPathVO);
+				String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.勘察.getCode(),powerStation.getNextProcessNode(), routhPathVO);
+				String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.勘察.getCode(),powerStation.getNextProcessNode(), routhPathVO);
 				if (PowerStationNodeEnum.经销商确认.getCode().equals(powerStationNodeEnum.getCode())) {
-					ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(), "用户" + name + "电站勘察待" + powerStationNodeEnum.getName(), peasantHousehold.getDeveloperCode(),routhPath,wxRouthPath);
+					ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.勘察.getCode(), powerStation.getSequenceNbr(),  name + "勘察待" + powerStationNodeEnum.getName(), peasantHousehold.getDeveloperCode(),routhPath,wxRouthPath);
 					List<String> userIds = new ArrayList<>();
 					userIds.add(peasantHousehold.getDeveloperUserId());
 					toDoTasksServiceImpl.addToDoTasksByUserIds(userIds, toDoTasks);
 				}else {
-					ToDoTasks toDoTasks= new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(), "用户" + name + "电站勘察待" + powerStationNodeEnum.getName(), peasantHousehold.getDeveloperCode(),routhPath,wxRouthPath);
+					ToDoTasks toDoTasks= new ToDoTasks(TaskTypeStationEnum.勘察.getCode(), powerStation.getSequenceNbr(), name + "勘察待" + powerStationNodeEnum.getName(), peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
 					List<String> todoUserIds = Arrays.asList(Optional.ofNullable(powerStation.getNextExecuteUserIds()).orElse("").split(","));
-					toDoTasksServiceImpl.completeAndAddToDoTask(todoUserIds, toDoTasks,meg);
+					List<String> filterUsers = toDoTasksServiceImpl.filterUsers(TaskTypeStationEnum.勘察.getCode(),powerStation.getNextProcessNode(),todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
+					toDoTasksServiceImpl.completeAndAddToDoTask(filterUsers, toDoTasks,meg);
 				}
 			} else {
-				ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr());
+				ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.勘察.getCode(), powerStation.getSequenceNbr());
 				toDoTasksServiceImpl.completeToDoTasks(toDoTasks,meg);
 			}
 
@@ -429,6 +426,14 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 				List<HouseholdContract> householdContracts = householdContractMapper.selectList(queryWrapper);
 				if (CollectionUtil.isNotEmpty(householdContracts) &&  householdContracts.size()>0 ){
 					peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
+					//生成发货待办
+					RouthPathVO routhPathVO = new RouthPathVO();
+					String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getCode(), routhPathVO);
+					String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getCode(), routhPathVO);
+					ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.发货.getCode(),  HygfRouthTypeEnum.HYGF_XZFHD.getBusiness(),   peasantHousehold.getOwnersName()+"待新增发货单",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
+					String roleId = toDoTasksServiceImpl.getRoleIdByName("户用光伏-仓储");
+					List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
+					toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
 				}
 
 

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -36,18 +34,15 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.component.emq.EmqKeeper;
-import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 勘察信息服务实现类
@@ -304,7 +299,7 @@ public class SurveyInformationServiceImpl
 				// peasantHousehold.setSurveyOrNot(1);
 			} else if (OPERATION_TYPE_APPLY.equals(operationType)) {
 				// 提交审核
-				ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站勘察.getCode(), peasantHousehold.getSequenceNbr());
+				ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.勘察.getCode(), peasantHousehold.getSequenceNbr());
 				toDoTasksService.completeToDoTasks(toDoTasks,"");
 				submitExamine(peasantHousehold);
 			}

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

@@ -35,6 +35,7 @@ import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -61,9 +62,9 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
     @Autowired
     Sequence sequence;
     @Value("classpath:/json/hygfRouth.json")
-    private Resource urlInfo;
+    private Resource hygfRouth;
     @Value("classpath:/json/wxHygfRouth.json")
-    private Resource wxUrlInfo;
+    private Resource wxHygfRouth;
 
     /**
      * 分页查询
@@ -324,14 +325,34 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
     }
 
     //获取路由地址
+    public List<String> filterUsers(String taskType, String key, List<String> userId, String companyOrgCode, String amosDealerCode) {
+        List<String> filterUsers = new ArrayList<>();
+        List<Map> hygfRouthList = JsonUtils.getResourceList(hygfRouth);
+        if (CollectionUtils.isNotEmpty(userId) && CollectionUtils.isNotEmpty(hygfRouthList)) {
+            for (Map map : hygfRouthList) {
+                if (map.get("taskType").equals(taskType) && map.get("key").equals(key) && "0".equals(map.get("isNeedSpecialDeal"))) {
+                    String isAdminRole = (String) map.get("isAdminRole");
+                    if ("1".equals(isAdminRole)) {
+                        filterUsers = toDoTasksMapper.filterUsersByAdmin(companyOrgCode, userId);
+                    } else if ("0".equals(isAdminRole)) {
+                        filterUsers = toDoTasksMapper.filterUsersByAmosDealer(companyOrgCode, amosDealerCode, userId);
+                    }
+                    break;
+                }
+            }
+        }
+        return filterUsers;
+    }
+
+    //获取路由地址
     public String getRouthPath(String taskType, String key, Object model) {
-        List<Map> urlList = JsonUtils.getResourceList(urlInfo);
+        List<Map> urlList = JsonUtils.getResourceList(hygfRouth);
         return getRouthPath(taskType, key, urlList, model);
     }
 
     //获取微信路由地址
     public String getWxRouthPath(String taskType, String key, Object model) {
-        List<Map> urlList = JsonUtils.getResourceList(wxUrlInfo);
+        List<Map> urlList = JsonUtils.getResourceList(wxHygfRouth);
         return getRouthPath(taskType, key, urlList, model);
     }