Merge branch 'dev0124' into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -105,6 +105,9 @@ public class ControllerAop {
         urls.add("/hygf/peasant-household/mobile/login");
         urls.add("/hygf/qiyuesuo/callback");
         urls.add("/hygf/unit-info/unitRegister");
+        urls.add("/hygf/maintenance/getDealer");
+        urls.add("/hygf/maintenance/save");
+        urls.add("/hygf/qiyuesuo/getUserToken");
 
 		// 获取请求路径
 		for (String uri : urls) {

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

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/3/12
+ */
+@Getter
+@AllArgsConstructor
+public enum MaintenanceTypeEnum {
+
+    经销商质保运维("经销商质保运维", "JXSZBYW"),
+    社会人员运维("社会人员运维", "SHRYYW");
+    /**
+     * 名称，描述
+     */
+    private String name;
+    /**
+     * 编码
+     */
+    private String code;
+
+    public static MaintenanceTypeEnum getNodeByCode(String code) {
+        MaintenanceTypeEnum dealerReviewEnum = null;
+        for(MaintenanceTypeEnum type: MaintenanceTypeEnum.values()) {
+            if (type.getCode().equals(code)) {
+                dealerReviewEnum = type;
+                break;
+            }
+        }
+        return dealerReviewEnum;
+    }
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/3/12
+ */
+@Getter
+@AllArgsConstructor
+public enum MaintenanceWorkersEnum {
+
+
+    电工("电工", "DG");
+    /**
+     * 名称，描述
+     */
+    private String name;
+    /**
+     * 编码
+     */
+    private String code;
+
+    public static MaintenanceWorkersEnum getNodeByCode(String code) {
+        MaintenanceWorkersEnum dealerReviewEnum = null;
+        for(MaintenanceWorkersEnum type: MaintenanceWorkersEnum.values()) {
+            if (type.getCode().equals(code)) {
+                dealerReviewEnum = type;
+                break;
+            }
+        }
+        return dealerReviewEnum;
+    }
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @description: 验收状态枚举
+ */
+@Getter
+@AllArgsConstructor
+@SuppressWarnings("ALL")
+public enum PowerStationEnum {
+
+    经销商确认("经销商确认", "1","hygf_02",""),
+
+    设计审核("设计审核", "2", "hygf_03","hygf/Sjsh"),
+
+    投融审核("投融审核", "3", "hygf_05","hygf/Sjsh"),
+
+    法务审核("法务审核", "4","hygf_07","hygf/Sjsh"),
+
+    设计上传典型图纸("设计上传典型图纸", "5", "hygf_09","hygf/Trsh"),
+
+    经销商设计上传设计图纸("经销商设计上传设计图纸", "6", "hygf_10","hygf/Fwsh"),
+
+    设计图纸审核("设计图纸审核", "7", "hygf_11","hygf/Sjsh"),
+
+    完成("完成", "11", "hygf_13","");
+
+    /**
+     * 名称，描述
+     */
+    private final String name;
+    /**
+     * 编码
+     */
+    private final String code;
+
+    //节点key
+    private final String key;
+
+    //路由r
+    private final String routing;
+
+
+    public static PowerStationEnum getNodeByCode(String code) {
+        PowerStationEnum acceptanceStatusEnum = null;
+        for (PowerStationEnum type : PowerStationEnum.values()) {
+            if (code.equals(type.getCode())) {
+                acceptanceStatusEnum = type;
+                break;
+            }
+        }
+        return acceptanceStatusEnum;
+    }
+    public static String getNodeByKey(String Key) {
+        PowerStationEnum acceptanceStatusEnum = null;
+        for (PowerStationEnum type : PowerStationEnum.values()) {
+            if (type.getKey().contains(Key)) {
+                acceptanceStatusEnum = type;
+                break;
+            }
+        }
+        return acceptanceStatusEnum.getRouting();
+    }
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserLimitsAdvice.java

@@ -46,6 +46,7 @@ public class UserLimitsAdvice {
         String userid=RequestContext.getExeUserId();
         LambdaQueryWrapper<StdUserEmpower> qu=new LambdaQueryWrapper();
         qu.eq(StdUserEmpower::getAmosUserId,userid);
+        qu.ne(StdUserEmpower::getPermissionType,"YTH");
         StdUserEmpower list= userEmpowerMapper.selectOne(qu);
         UserEmpowerThreadLocal.setDataAuthRule(list!=null?list.getAmosOrgCode():null);
         //正常往后执行

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/**
+ * @author LiuLin
+ * @date 2023年08月02日 11:02
+ */
+@Data
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+public class BizMessage {
+    private String indexKey;
+    private String indexValue;
+    private String traceId;
+    private RiskBizInfoVo bizInfo;
+    /**
+     * 数据来源：实时数据、周期数据
+     */
+    String dataSource;
+    private String traceId2;
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * 自定义扩展内容项
+ */
+@Data
+public class CustomizeItems {
+    /**
+     * 自定义的问题名称
+     */
+    private String questionName;
+    /**
+     * 自定义的问题内容
+     */
+    private String questionContent;
+
+    /**
+     * 自定义的预警内容 content
+     */
+    private String warningContent;
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.joda.time.DateTime;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="HYGFMaintenanceTicketsDto", description="运维工单")
+public class HYGFMaintenanceTicketsDto extends BaseDto {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 工单处理状态
+     */
+    private String handlerStatus;
+    /**
+     * 场站id
+     */
+    private String stationId;
+    /**
+     * 业主姓名
+     */
+    private String ownerName;
+    /**
+     * 场站名称
+     */
+    private String stationName;
+    /**
+     * 逆变器sn编码
+     */
+    private String inverterSn;
+    /**
+     * 告警等级
+     */
+    private String warningLevel;
+    /**
+     * 告警内容
+     */
+    private String warningContent;
+    /**
+     * 告警开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date warningStartTime;
+    /**
+     * 告警开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date warningEndTime;
+    /**
+     * 告警时长
+     */
+    private String warningDuration;
+
+    /**
+     * 告警状态
+     */
+    private String warningStatus;
+    /**
+     * 场站联系人
+     */
+    private String stationContact;
+    /**
+     * 场站联系人电话
+     */
+
+    private String stationContactPhone;
+    /**
+     * 场站地址
+     */
+
+    private String stationAddress;
+    /**
+     * 处理附件
+     */
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> hanlerContentAttachment;
+    /**
+     * 处理方式
+     */
+    private String handlerMethod;
+    /**
+     * 是否替换备件
+     */
+
+    private Boolean isReplaceSpareParts =false;
+    /**
+     * 运维人员附件
+     */
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> sparePartsAttchment;
+    /**
+     * 场站运维人员id
+     */
+    private String maintenancePersonId;
+    /**
+     * 场站经度
+     */
+    private String stationLongitude;
+    /**
+     * 场站纬度
+     */
+    private String stationLatitude;
+    /**
+     * 运维人员名称
+     */
+    private String maintenancePersonName;
+    /**
+     * 运维人员手机号
+     */
+    private String maintenancePersonPhone;
+    /**
+     * tdengine告警id
+     */
+    private Long warningId;
+    /**
+     * 区域公司orgCode
+     */
+    private String regionalCompaniesCode;
+
+    /**
+     * 经销商orgcode
+     */
+    private String amosCompanyCode;
+    /**
+     * 工单类型
+     */
+    private String ticketType;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date taskStartTime;
+    /**
+     * 告警开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date taskEndTime;
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.module.hygf.api.entity.MaintenanceFile;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 运维人员
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="MaintenanceDto", description="运维人员")
+public class MaintenanceDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "运维人员类型名称")
+    private String maintenanceType;
+
+    @ApiModelProperty(value = "运维人员类型code")
+    private String maintenanceTypeCode;
+
+    @ApiModelProperty(value = "运维区域名称")
+    private String maintenanceArea;
+
+    @ApiModelProperty(value = "运维区域code")
+    private String maintenanceAreaCode;
+
+    @ApiModelProperty(value = "运维工种名称")
+    private String maintenanceWorkers;
+
+    @ApiModelProperty(value = "运维工种code")
+    private String maintenanceWorkersCode;
+
+    @ApiModelProperty(value = "所属区域公司id")
+    private Long regionalCompaniesSeq;
+
+    @ApiModelProperty(value = "所属区域公司名称")
+    private String regionalCompaniesName;
+
+    @ApiModelProperty(value = "所属区域公司code")
+    private String regionalCompaniesCode;
+
+    @ApiModelProperty(value = "业务经销商name")
+    private String dealerName;
+
+    @ApiModelProperty(value = "业务经销商id")
+    private Long dealerId;
+
+    @ApiModelProperty(value = "平台经销商单位id")
+    private Long amosDealerId;
+
+    @ApiModelProperty(value = "平台经销商code")
+    private String amosDealerCode;
+
+    @ApiModelProperty(value = "证件号码")
+    private String idCard;
+
+    @ApiModelProperty(value = "身份证正面")
+    private String idCardFront;
+
+    @ApiModelProperty(value = "身份证反面")
+    private String idCardOpposite;
+
+    @ApiModelProperty(value = "业主姓名")
+    private String name;
+
+    @ApiModelProperty(value = "联系电话")
+    private String telephone;
+
+    @ApiModelProperty(value = "证件类型")
+    private String idType;
+
+    @ApiModelProperty(value = "管理员账户名")
+    private String adminLoginName;
+
+    @ApiModelProperty(value = "管理员密码")
+    private String adminLoginPwd;
+
+//    @ApiModelProperty(value = "低压电工证")
+//    private String electricianCertificate;
+//
+//    @ApiModelProperty(value = "登高证")
+//    private String climbingCertificate;
+//
+//    @ApiModelProperty(value = "低压电工证有效期开始")
+//    private Date electricianCertificateStart;
+//
+//    @ApiModelProperty(value = "低压电工证有效期结束")
+//    private Date electricianCertificateEnd;
+//
+//    @ApiModelProperty(value = "登高证有效期开始")
+//    private Date climbingCertificateStart;
+//
+//    @ApiModelProperty(value = "登高证有效期结束")
+//    private Date climbingCertificateEnd;
+
+    @ApiModelProperty(value = "培训状态")
+    private String trainingStatus;
+
+    @ApiModelProperty(value = "审核状态")
+    private String reviewStatus;
+
+    @ApiModelProperty(value = "平台userId")
+    private String amosUserId;
+
+    @ApiModelProperty(value = "是否锁定")
+    private String lockStatus;
+
+    @ApiModelProperty(value = "运维区域详细地址")
+    private String maintenanceAreaAddress;
+
+    @ApiModelProperty(value = "常住地址code")
+    private String permanentAddressCode;
+
+    @ApiModelProperty(value = "常住详细地址")
+    private String permanentAddressDetail;
+
+    @ApiModelProperty(value = "常住地址")
+    private String permanentAddressName;
+
+    /**
+     *
+     * 基础人员表
+     * */
+    private Long foundationId;
+
+
+    //证书
+    List<MaintenanceFile> maintenanceFiles;
+
+
+    @ApiModelProperty(value = "身份证正面")
+    private  List<Object> idCardFrontList;
+
+    @ApiModelProperty(value = "身份证反面")
+    private  List<Object> idCardOppositeList;
+
+    @ApiModelProperty(value = "是否签订安全协议")
+    private  Integer  isSignAnAgreement ;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 运维人员文件
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="MaintenanceFileDto", description="运维人员文件")
+public class MaintenanceFileDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "运维人员id")
+    private Long maintenanceId;
+
+    @ApiModelProperty(value = "文件标识")
+    private String fileKey;
+
+    @ApiModelProperty(value = "文件标识名称")
+    private String fileKeyName;
+
+    @ApiModelProperty(value = "文件对象")
+    private String fileUrl;
+
+    @ApiModelProperty(value = "有效开始时间")
+    private Date effectiveDateStart;
+
+    @ApiModelProperty(value = "有效结束时间")
+    private Date effectiveDateEnd;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 运维人员操作记录
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="MaintenanceLogDto", description="运维人员操作记录")
+public class MaintenanceLogDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = " 运维人员id")
+    private Long maintenanceId;
+
+    @ApiModelProperty(value = "操作人")
+    private String operator;
+
+    @ApiModelProperty(value = "操作内容")
+    private String operationContent;
+
+    @ApiModelProperty(value = "操作时间")
+    private Date operationTime;
+
+    @ApiModelProperty(value = "操作结果")
+    private String operationResults;
+
+    @ApiModelProperty(value = "备注")
+    private String notes;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="MaintenanceTrainingDto", description="")
+public class MaintenanceTrainingDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "运维人员id")
+    private String userId;
+
+    @ApiModelProperty(value = "培训资料id")
+    private Long trainingId;
+
+}

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

@@ -10,6 +10,6 @@ import lombok.Data;
 @Data
 public class ProcessDto {
     private  String businessKey;//业务id
-    private  String processDefinitionKey="hygf_bwys";//工作流key
+    private  String processDefinitionKey;//工作流key
     private  boolean completeFirstTask=true;//是否执行第一个节点  false true
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author LiuLin
+ * @date 2023年08月02日 11:02
+ */
+@Data
+public class RiskBizInfoVo {
+    private String warningObjectName;
+    private String warningObjectCode;
+    private String warningTime;
+    private String sourceAttribution;
+    private String sourceAttributionDesc;
+    private String sourceSupplyField;
+    private String bussId;
+    private String bussName;
+    private String type;
+    private List<RiskDynamicDetailsVo> dynamicDetails;
+    private String warningObjectType;
+    private CustomizeItems customizeItems;
+    private String warningObjectLinkUrl;
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author LiuLin
+ * @date 2023年08月02日 11:02
+ */
+@Data
+public class RiskDynamicDetailsVo {
+    private String tabName;
+    private List<TableContentVo> tabContent;
+    private Map<String, Object> specialMap;
+}

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
-import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
-import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationConstructionData;
-import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationEngineeringInfo;
-import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
+import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
@@ -49,5 +46,7 @@ public class SurveyInfoAllDto {
     WorkOrder workOrder;
 
 
+    //自审信息
 
+    ConstructionRecords constructionRecords;
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+/**
+ * @author LiuLin
+ * @date 2023年08月02日 11:02
+ */
+@Data
+public class TableContentVo {
+    private String key;
+    private String label;
+    private Object value;
+    private String type;
+
+    public TableContentVo(String key, String label, Object value, String type) {
+        this.key = key;
+        this.label = label;
+        this.value = value;
+        this.type = type;
+    }
+
+    public TableContentVo() {
+    }
+}

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -40,7 +43,6 @@ public class TdHygfJpInverterWarnDto {
 	@ApiModelProperty(value = "恢复时间")
 	private Long recoverTime;
 
-
 	@ApiModelProperty(value = "恢复时间")
 	private Date recoverTimeString;
 
@@ -85,4 +87,138 @@ public class TdHygfJpInverterWarnDto {
 	
 	private List<String> states;
     private String name;
+    private String handlerStatus;
+    private List<String>  listHandlerStatus;
+
+
+	/**
+	 * 场站id
+	 */
+	private String stationId;
+
+	/**
+	 * 业主名称
+	 */
+	private String ownerName;
+
+	/**
+	 * 逆变器sn编码
+	 */
+	private String inverterSn;
+	/**
+	 * 告警等级
+	 */
+	private String warningLevel;
+	/**
+	 * 告警状态
+	 */
+	private String warningStatus;
+	/**
+	 * 告警内容
+	 */
+	private String warningContent;
+	/**
+	 * 告警开始时间
+	 */
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date warningStartTime;
+	/**
+	 * 告警开始时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
+	private Date warningEndTime;
+	/**
+	 * 告警时长
+	 */
+
+	private String warningDuration;
+
+	/**
+	 * 场站联系人电话
+	 */
+
+	private String stationContactPhone;
+	/**
+	 * 场站地址
+	 */
+
+	private String stationAddress;
+	/**
+	 * 处理附件
+	 */
+	@TableField(value = "handler_content_attachment",typeHandler = FastjsonTypeHandler.class)
+	private List<Object> hanlerContentAttachment;
+	/**
+	 * 处理方式
+	 */
+
+	private String handlerMethod;
+	/**
+	 * 是否替换备件
+	 */
+
+	private Boolean isReplaceSpareParts =false;
+	/**
+	 * 运维人员附件
+	 */
+	@TableField(value = "spare_parts_attchment",typeHandler = FastjsonTypeHandler.class)
+	private List<Object> sparePartsAttchment;
+	/**
+	 * 场站运维人员id
+	 */
+
+	private String maintenancePersonId;
+	/**
+	 * 场站经度
+	 */
+
+	private String stationLongitude;
+	/**
+	 * 场站纬度
+	 */
+
+	private String stationLatitude;
+	/**
+	 * 运维人员名称
+	 */
+
+	private String maintenancePersonName;
+	/**
+	 * 运维人员手机号
+	 */
+
+	private String maintenancePersonPhone;
+	/**
+	 * tdengine告警id
+	 */
+
+	private Long warningId;
+	/**
+	 * 区域公司orgCode
+	 */
+
+	private String regionalCompaniesCode;
+
+	/**
+	 * 经销商orgcode
+	 */
+	private String amosCompanyCode;
+
+	private String ticketType;
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date taskStartTime;
+	/**
+	 * 告警开始时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date taskEndTime;
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date recDate;
+
+	private Long sequenceNbr;
+
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 培训信息表
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TrainingDto", description="培训信息表")
+public class TrainingDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "科目名称")
+    private String name;
+
+    @ApiModelProperty(value = "文件类型")
+    private String type;
+
+    @ApiModelProperty(value = "文件地址")
+    private String files;
+
+    @ApiModelProperty(value = "学习状态")
+    private Integer status;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.joda.time.DateTime;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "hygf_maintenance_tickets",autoResultMap = true)
+public class HYGFMaintenanceTickets extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 工单处理状态
+     */
+    @TableField("handler_status")
+    private String handlerStatus;
+    /**
+     * 场站id
+     */
+    @TableField("station_id")
+    private String stationId;
+
+    /**
+     * 业主名称
+     */
+    @TableField("owner_name")
+    private String ownerName;
+    /**
+     * 场站名称
+     */
+    @TableField("station_name")
+    private String stationName;
+    /**
+     * 逆变器sn编码
+     */
+    @TableField("inverter_sn")
+    private String inverterSn;
+    /**
+     * 告警等级
+     */
+    @TableField("warning_level")
+    private String warningLevel;
+    /**
+     * 告警状态
+     */
+    @TableField("warning_status")
+    private String warningStatus;
+    /**
+     * 告警内容
+     */
+    @TableField("warning_content")
+    private String warningContent;
+    /**
+     * 告警开始时间
+     */
+    @TableField("warning_start_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date warningStartTime;
+    /**
+     * 告警开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("warning_end_time")
+    private Date warningEndTime;
+    /**
+     * 告警时长
+     */
+    @TableField("warning_duration")
+    private String warningDuration;
+    /**
+     * 场站联系人
+     */
+    @TableField("station_contact")
+    private String stationContact;
+    /**
+     * 场站联系人电话
+     */
+    @TableField("station_contact_phone")
+    private String stationContactPhone;
+    /**
+     * 场站地址
+     */
+    @TableField("station_address")
+    private String stationAddress;
+    /**
+     * 处理附件
+     */
+    @TableField(value = "handler_content_attachment",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> hanlerContentAttachment;
+    /**
+     * 处理方式
+     */
+    @TableField("handler_method")
+    private String handlerMethod;
+    /**
+     * 是否替换备件
+     */
+    @TableField("is_repleace_spare_parts")
+    private Boolean isReplaceSpareParts =false;
+    /**
+     * 运维人员附件
+     */
+    @TableField(value = "spare_parts_attchment",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> sparePartsAttchment;
+    /**
+     * 场站运维人员id
+     */
+    @TableField("maintenance_person_id")
+    private String maintenancePersonId;
+    /**
+     * 场站经度
+     */
+    @TableField("station_longitude")
+    private String stationLongitude;
+    /**
+     * 场站纬度
+     */
+    @TableField("station_latitude")
+    private String stationLatitude;
+    /**
+     * 运维人员名称
+     */
+    @TableField("maintenance_person_name")
+    private String maintenancePersonName;
+    /**
+     * 运维人员手机号
+     */
+    @TableField("maintenance_person_phone")
+    private String maintenancePersonPhone;
+    /**
+     * tdengine告警id
+     */
+    @TableField("warning_id")
+    private Long warningId;
+    /**
+     * 区域公司orgCode
+     */
+    @TableField("regional_companies_code")
+    private String regionalCompaniesCode;
+
+    /**
+     * 经销商orgcode
+     */
+    @TableField("amos_company_code")
+    private String amosCompanyCode;
+    @TableField("ticket_type")
+    private String ticketType;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("task_start_time")
+    private Date taskStartTime;
+    /**
+     * 告警开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("task_end_time")
+    private Date taskEndTime;
+
+    @TableField("score")
+    private String score ;
+}

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

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 第三方场站
@@ -218,4 +219,7 @@ public class JpStation extends BaseEntity {
     @TableField("amos_company_code")
     private String amosCompanyCode;
 
+    @TableField(exist = false)
+    private List<String> snCodes;
+
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 运维人员
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "hygf_maintenance",autoResultMap = true)
+public class Maintenance extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 运维人员类型名称
+     */
+    @TableField("maintenance_type")
+    private String maintenanceType;
+
+    /**
+     * 运维人员类型code
+     */
+    @TableField("maintenance_type_code")
+    private String maintenanceTypeCode;
+
+    /**
+     * 运维区域名称
+     */
+    @TableField("maintenance_area")
+    private String maintenanceArea;
+
+    /**
+     * 运维区域code
+     */
+    @TableField(value = "maintenance_area_code",typeHandler = FastjsonTypeHandler.class)
+    private List<Integer> maintenanceAreaCode;
+
+    /**
+     * 运维工种名称
+     */
+    @TableField("maintenance_workers")
+    private String maintenanceWorkers;
+
+    /**
+     * 运维工种code
+     */
+    @TableField("maintenance_workers_code")
+    private String maintenanceWorkersCode;
+
+    /**
+     * 所属区域公司id
+     */
+    @TableField("regional_companies_seq")
+    private Long regionalCompaniesSeq;
+
+    /**
+     * 所属区域公司名称
+     */
+    @TableField("regional_companies_name")
+    private String regionalCompaniesName;
+
+    /**
+     * 所属区域公司code
+     */
+    @TableField("regional_companies_code")
+    private String regionalCompaniesCode;
+
+    /**
+     * 业务经销商name
+     */
+    @TableField("dealer_name")
+    private String dealerName;
+
+    /**
+     * 业务经销商id
+     */
+    @TableField("dealer_id")
+    private Long dealerId;
+
+    /**
+     * 平台经销商单位id
+     */
+    @TableField(exist = false)
+    private Long amosDealerId;
+   /**
+    *
+    * 基础人员表
+    * */
+    @TableField("foundation_id")
+    private Long foundationId;
+
+
+    /**
+     * 平台经销商code
+     */
+    @TableField(exist = false)
+    private String amosDealerCode;
+
+    /**
+     * 证件号码
+     */
+    @TableField(exist = false)
+   private String idCard;
+
+    /**
+     * 身份证正面
+     */
+
+    @TableField(exist = false, typeHandler = FastjsonTypeHandler.class)
+    private List<Object> idCardFront;
+    /**
+     * 身份证反面
+     */
+    @TableField(exist = false, typeHandler = FastjsonTypeHandler.class)
+    private List<Object> idCardOpposite;
+    /**
+     * 业主姓名
+     */
+    @TableField(exist = false)
+    private String name;
+
+    /**
+     * 联系电话
+     */
+    @TableField(exist = false)
+    private String telephone;
+
+    /**
+     * 证件类型
+     */
+    @TableField(exist = false)
+    private String idType;
+
+
+
+    /**
+     * 管理员账户名
+     */
+    @TableField(exist = false)
+    private String adminLoginName;
+
+    /**
+     * 管理员密码
+     */
+    @TableField(exist = false)
+    private String adminLoginPwd;
+    /**
+     * 平台userId
+     */
+    @TableField(exist = false)
+    private String amosUserId;
+    /**
+     * 是否锁定
+     */
+    @TableField(exist = false)
+    private String lockStatus;
+    /**
+     * 低压电工证
+     */
+    @TableField(exist = false, typeHandler = FastjsonTypeHandler.class)
+    private  List<Object> electricianCertificate;
+
+    /**
+     * 登高证
+     */
+    @TableField(exist = false, typeHandler = FastjsonTypeHandler.class)
+    private  List<Object> climbingCertificate;
+
+    /**
+     * 低压电工证有效期开始
+     */
+    @TableField(exist = false)
+    private Date electricianCertificateStart;
+
+    /**
+     * 低压电工证有效期结束
+     */
+    @TableField(exist = false)
+    private Date electricianCertificateEnd;
+
+    /**
+     * 登高证有效期开始
+     */
+    @TableField(exist = false)
+    private Date climbingCertificateStart;
+
+    /**
+     * 登高证有效期结束
+     */
+    @TableField(exist = false)
+    private Date climbingCertificateEnd;
+
+    /**
+     * 培训状态
+     */
+    @TableField("training_status")
+    private String trainingStatus;
+
+    /**
+     * 审核状态
+     */
+    @TableField("review_status")
+    private String reviewStatus;
+
+
+
+
+
+    /**
+     * 运维区域详细地址
+     */
+    @TableField("maintenance_area_address")
+    private String maintenanceAreaAddress;
+
+    /**
+     * 常住地址code
+     */
+    @TableField(value ="permanent_address_code",typeHandler = FastjsonTypeHandler.class)
+    private List<Integer>  permanentAddressCode;
+
+    /**
+     * 常住详细地址
+     */
+    @TableField("permanent_address_detail")
+    private String permanentAddressDetail;
+
+    /**
+     * 常住地址
+     */
+    @TableField("permanent_address_name")
+    private String permanentAddressName;
+
+    //证书
+    @TableField(exist = false)
+    List<MaintenanceFile> maintenanceFiles;
+    /**
+     * 是否签订安全协议
+     */
+    @TableField("is_sign_an_agreement")
+    private  Integer  isSignAnAgreement ;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 运维人员文件
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value ="hygf_maintenance_file",autoResultMap = true)
+public class MaintenanceFile extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 运维人员id
+     */
+    @TableField("maintenance_id")
+    private Long maintenanceId;
+
+    /**
+     * 文件标识
+     */
+    @TableField("file_key")
+    private String fileKey;
+
+    /**
+     * 文件标识名称
+     */
+    @TableField("file_key_name")
+    private String fileKeyName;
+
+    /**
+     * 文件对象
+     */
+    @TableField(value ="file_url", typeHandler = FastjsonTypeHandler.class)
+    private List<Object> fileUrl;
+
+    /**
+     * 有效开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField("effective_date_start")
+    private Date effectiveDateStart;
+
+    /**
+     * 有效结束时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField("effective_date_end")
+    private Date effectiveDateEnd;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 运维人员操作记录
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_maintenance_log")
+public class MaintenanceLog extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *  运维人员id
+     */
+	@TableField("maintenance_id")
+    private Long maintenanceId;
+
+    /**
+     * 操作人
+     */
+	@TableField("operator")
+    private String operator;
+
+    /**
+     * 操作内容
+     */
+	@TableField("operation_content")
+    private String operationContent;
+
+    /**
+     * 操作时间
+     */
+	@TableField("operation_time")
+    private Date operationTime;
+
+    /**
+     * 操作结果
+     */
+	@TableField("operation_results")
+    private String operationResults;
+
+    /**
+     * 备注
+     */
+	@TableField("notes")
+    private String notes;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_maintenance_training")
+public class MaintenanceTraining extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 运维人员id
+     */
+	@TableField("user_id")
+    private String userId;
+
+    /**
+     * 培训资料id
+     */
+	@TableField("training_id")
+    private Long trainingId;
+
+}

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

@@ -88,13 +88,13 @@ public class PowerStation extends BaseEntity {
     private String peasantHouseholdId;
 
     /**
-     * 任务id
+     * //	流程下一节点id
      */
     @TableField("task_id")
     private String taskId;
 
     /**
-     * 流程定义id
+     * 工作流实例ID
      */
     @TableField("process_definition_id")
     private String processDefinitionId;
@@ -105,11 +105,12 @@ public class PowerStation extends BaseEntity {
     @TableField("node_routing")
     private String nodeRouting;
 
+    ///	下一个节点角色权限
     @TableField("node_role")
     private String nodeRole;
 
     /**
-     * 当前流程节点
+     *   //下个节点key
      */
     @TableField("next_process_node")
     private String nextProcessNode;
@@ -129,4 +130,23 @@ public class PowerStation extends BaseEntity {
     @TableField("drawing_review")
     private String drawingReview;
 
+
+
+
+    //下一节点可执行人逗号分割	0	0
+    @TableField("next_execute_user_ids")
+    private String nextExecuteUserIds;
+
+    //工作流发起人id
+    @TableField("create_user_id")
+    private String createUserId;
+
+    //下个节点名称
+    @TableField("next_node_name")
+    private String nextNodeName;
+
+    //	当前节点执行任务id
+    @TableField("promoter")
+    private String promoter;
+
 }

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

@@ -35,7 +35,8 @@ public class StdUserEmpower extends BaseEntity {
     @TableField(value = "amos_org_code",typeHandler = FastjsonTypeHandler.class)
     private List<String> amosOrgCode;
 
-
+    @TableField("permission_type")
+    private String permissionType;
 
 
 }

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

@@ -19,6 +19,8 @@ import java.util.Date;
 public class TdHygfJpInverterWarn {
 
 	private static final long serialVersionUID = 1L;
+	@TableField("created_time")
+	private Long createdTime;
 
 	/**
 	 * sn编码
@@ -48,13 +50,13 @@ public class TdHygfJpInverterWarn {
 	 * 起始时间
 	 */
 	@TableField("start_time")
-	private Date startTime;
+	private Long startTime;
 
 	/**
 	 * 恢复时间
 	 */
 	@TableField("recover_time")
-	private Date recoverTime;
+	private Long recoverTime;
 
 	/**
 	 * 处理方法
@@ -62,11 +64,11 @@ public class TdHygfJpInverterWarn {
 	@TableField("treatment")
 	private String treatment;
 
-	/**
-	 * 逆变器id
-	 */
-	@TableField("inverter_id")
-	private Long inverterId;
+//	/**
+//	 * 逆变器id
+//	 */
+//	@TableField("inverter_id")
+//	private Long inverterId;
 
 	/**
 	 * 第三方电站id
@@ -91,5 +93,10 @@ public class TdHygfJpInverterWarn {
 	 */
 	@TableField("time")
 	private Long time;
+	/**
+	 * 处理状态
+	 */
+	@TableField("handler_status")
+	private String handlerStatus ;
 
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 培训信息表
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_training")
+public class Training extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 科目名称
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 文件类型
+     */
+	@TableField("type")
+    private String type;
+
+    /**
+     * 文件地址
+     */
+	@TableField("files")
+    private String files;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.dto.HYGFMaintenanceTicketsDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HYGFMaintenanceTickets;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+public interface HYGFMaintenanceTicketsMapper extends BaseMapper<HYGFMaintenanceTickets> {
+    @Select("SELECT sn_code FROM hygf_jp_inverter WHERE third_station_id = #{stationId}")
+    List<String> queryInverterSncodesByStationId(String stationId);
+    @Update("update hygf_maintenance_tickets SET score = #{score} WHERE sequence_nbr = #{sequenceNbr}")
+    void updateScoreBySequenceNbr(String score,Long sequenceNbr);
+    List<HYGFMaintenanceTicketsDto> qureyListByQueryparams(@Param("dto") HYGFMaintenanceTicketsDto dto );
+}

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

@@ -27,6 +27,8 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
     @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
     List<JpStation> getJpStation(@Param("dto") JpStationDto reviewDto);
 
+    List<JpStation> getJpStationList(@Param("dto") JpStationDto reviewDto);
+
     @UserEmpower(field ={"ORG_CODE"} ,fieldConditions ={"in"} ,relationship="")
     List<DropDown>  getRegion();
 
@@ -54,4 +56,7 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
     @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
     @UserLimits
     List<JpStationDto> queryForDealerReviewPagenew(@Param("dto") JpStationDto reviewDto, Page<JpStationDto> pa);
+
+
+    List<DropDown>  getDealerNew(@Param("regionalCompaniesSeq") String regionalCompaniesSeq);
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.MaintenanceFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 运维人员文件 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+public interface MaintenanceFileMapper extends BaseMapper<MaintenanceFile> {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.MaintenanceLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 运维人员操作记录 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+public interface MaintenanceLogMapper extends BaseMapper<MaintenanceLog> {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.Maintenance;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 运维人员 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+public interface MaintenanceMapper extends BaseMapper<Maintenance> {
+
+
+    public  void updateTraining(String userId);
+
+    public  void updateTrainingAgreement(String userId);
+
+    //验证平台手机号验证平台账号
+
+    public Integer selectauthLogininfo(@Param("telephone")String telephone,@Param("adminLoginName")String adminLoginName);
+
+    //验证运维人员手机号账号
+
+    public Integer selectMaintenance(@Param("telephone")String telephone,@Param("adminLoginName")String adminLoginName);
+
+    //列表
+    List<MaintenanceDto> Maintenancepage(@Param("name")String name, @Param("maintenanceTypeCode")String maintenanceTypeCode,
+                                         @Param("lockStatus")String lockStatus, @Param("reviewStatus")String reviewStatus,
+                                         @Param("regionalCompaniesSeq")Long regionalCompaniesSeq, @Param("dealerId") Long dealerId,@Param("maintenanceType")String maintenanceType,
+                                         @Param("maintenanceAreaAddress")String maintenanceAreaAddress);
+
+
+    //详情
+    MaintenanceDto  selectOneById( @Param("sequenceNbr")Long sequenceNbr  );
+
+
+    //验证账号是否签协议
+
+    MaintenanceDto getTrainingAgreement( @Param("userId")String userId  );
+
+    List<MaintenanceDto> queryList(
+            @Param("name")String name, //运维人员类型
+            @Param("maintenanceType")String maintenanceType //运维人员类型code
+    );
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.MaintenanceTraining;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.Map;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+public interface MaintenanceTrainingMapper extends BaseMapper<MaintenanceTraining> {
+
+   Map<String,Long> selectTrainingStatus(String userId);
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.TrainingDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.Training;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 培训信息表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+public interface TrainingMapper extends BaseMapper<Training> {
+
+/**
+ * 查询当前人培训资料学习状态
+ * */
+   List<TrainingDto> currentStudyStatusList(
+           @Param("current") Integer current,
+           @Param("size") Integer size,
+           @Param("userId") String userId,
+           @Param("status")  Integer status,
+           @Param("name") String name
+           );
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IHYGFMaintenanceTicketsService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+public interface IHYGFMaintenanceTicketsService {
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IMaintenanceFileService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 运维人员文件接口类
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+public interface IMaintenanceFileService {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IMaintenanceLogService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 运维人员操作记录接口类
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+public interface IMaintenanceLogService {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IMaintenanceService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 运维人员接口类
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+public interface IMaintenanceService {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IMaintenanceTrainingService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+public interface IMaintenanceTrainingService {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/ITrainingService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 培训信息表接口类
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+public interface ITrainingService {
+
+}

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

@@ -5,7 +5,9 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterWarn;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -17,13 +19,20 @@ import java.util.Map;
  */
 public interface TdHygfJpInverterWarnMapper extends BaseMapper<TdHygfJpInverterWarn> {
 
-	List<Map<String, Object>> getCountTdHygfJpInverterWarn(@Param("dto") List<JpStation> dto);
+    List<Map<String, Object>> getCountTdHygfJpInverterWarn(@Param("dto") List<JpStation> dto);
 
-	List<TdHygfJpInverterWarnDto> list(@Param("param") TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto);
 
-	TdHygfJpInverterWarnDto getByTime(@Param("createdTime") long createdTime);
+    List<TdHygfJpInverterWarnDto> list(@Param("param") TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto);
 
-	List<TdHygfJpInverterWarnDto>  selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content, Integer current, Integer size);
+    @Select(" SELECT  *   from house_pv_data. td_hygf_jp_inverter_warn limit 0,10")
+    List<TdHygfJpInverterWarnDto> listAll();
 
-	int  selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content);
-	}
+    TdHygfJpInverterWarnDto getByTime(@Param("createdTime") long createdTime);
+
+    List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, Integer current, Integer size,String handlerStatus);
+
+    int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content,String handlerStatus);
+
+    @Select("SELECT  *  from td_hygf_jp_inverter_warn  WHERE (third_station_id = #{thirdStationId} AND sn_code = #{sncode} AND created_time = #{createdTime})")
+    TdHygfJpInverterWarn getInverTerWarnByparams(@Param("createdTime") long createdTime, @Param("sncode") String snCode, @Param("thirdStationId") String thirdStationId);
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/MaintenanceUtil.java

+package com.yeejoin.amos.boot.module.hygf.api.util;
+
+import java.util.HashMap;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/3/12
+ */
+public class MaintenanceUtil {
+    //"培训状态"
+    public static final String YPX= "已培训";
+    public static final String WPX= "未培训";
+
+    //"审核状态"
+    public static final String SHZ="审核中";
+    public static final String TG="通过";
+    public static final String BH="驳回";
+
+    //"是否锁定"
+    public static final String OK="是";
+    public static final String NO="否";
+
+    //  是否签订安全协议
+    public  static  final Integer  QD = 0 ;
+    public  static  final Integer  WQD = 1 ;
+
+
+
+
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/NumberUtil.java

@@ -35,13 +35,14 @@ public class NumberUtil {
     //当天生成4位随机不重复数
     public static Integer getnum(){
         Random rand = new Random();
-        if(needQueryResProductList.containsKey("num")&&needQueryResProductList.get("num")!=null&&needQueryResProductList.get("num")<9999){
-            Integer num= needQueryResProductList.get("num")+rand.nextInt(100) + 1;
-            needQueryResProductList.put("num",num);
-            return num;
-        }else{
-            int num = rand.nextInt(9000) + 1;
-            needQueryResProductList.put("num",num);
+     if(needQueryResProductList.containsKey("num")&&needQueryResProductList.get("num")!=null&&needQueryResProductList.get("num")<9999){
+         Integer num= needQueryResProductList.get("num")+rand.nextInt(100) + 1;
+         needQueryResProductList.put("num",num);
+         return num;
+     }else{
+         int num = rand.nextInt(9000) + 1;
+        needQueryResProductList.put("num",num);
+
 
             return num;
         }

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

@@ -90,6 +90,6 @@
             </if>
         </where>
         ORDER BY
-            bga.acceptance_rec_date DESC
+         bga.acceptance_rec_date DESC,bga.rec_date desc
     </select>
 </mapper>

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

@@ -67,5 +67,8 @@
                 AND DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') = DATE_FORMAT( #{map.gridConnectionTime}, '%Y-%m-%d')
             </if>
         </where>
+        ORDER BY
+        FIELD(hbga.grid_status, '1', '2', '4', '3'),
+         hogaa.grid_connection_time desc
     </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HYGFMaintenanceTicketsMapper.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.mapper.HYGFMaintenanceTicketsMapper">
+
+
+    <select id="qureyListByQueryparams"
+            resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HYGFMaintenanceTicketsDto">
+        select * from
+        hygf_maintenance_tickets
+        <where>
+            is_delete = 0
+            <if test="dto.handlerStatus != null and dto.handlerStatus !=''">
+                And handler_status = #{dto.handlerStatus}
+            </if>
+            <if test="dto.stationName != null and dto.stationName !=''">
+                And station_name LIKE CONCAT('%', #{dto.stationName}, '%')
+            </if>
+        </where>
+        order by sequence_nbr desc
+    </select>
+</mapper>

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

@@ -200,6 +200,47 @@
         </where>
     </select>
 
+    <select id="getJpStationList"  resultType="com.yeejoin.amos.boot.module.hygf.api.entity.JpStation">
+        select
+        *
+        from hygf_jp_station
+
+        <where>
+            is_delete=0
+            <if test="dto.name!=null">
+                and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
+            </if>
+            <if test="dto.userName!=null">
+                and hygf_jp_station.user_name like concat(concat("%",#{dto.userName}),"%")
+            </if>
+            <if test="dto.address!=null">
+                and hygf_jp_station.address like concat(concat("%",#{dto.address}),"%")
+            </if>
+            <if test="dto.area!=null">
+                and hygf_jp_station.area like concat(concat("%",#{dto.area}),"%")
+            </if>
+            <if test="dto.thirdStationIds!=null and dto.thirdStationIds.size()> 0 ">
+                and hygf_jp_station.third_station_id in
+                <foreach collection="dto.thirdStationIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="dto.thirdStationId!=null">
+                and hygf_jp_station.third_station_id =#{dto.thirdStationId}
+            </if>
+            <if test="dto.regionalCompaniesCode!=null and dto.regionalCompaniesCode!=''">
+                and hygf_jp_station.regional_companies_code =#{dto.regionalCompaniesCode}
+            </if>
+            <if test="dto.amosCompanyCode!=null and dto.amosCompanyCode!=''">
+                and hygf_jp_station.amos_company_code =#{dto.amosCompanyCode}
+            </if>
+            <if test="dto.state!=null">
+                and   hygf_jp_station.`state` =#{dto.state}
+            </if>
+
+        </where>
+    </select>
+
     <select id="getRegion"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
         SELECT  privilege_company.ORG_CODE orgCode ,
         privilege_company.COMPANY_NAME  name
@@ -218,7 +259,18 @@
       GROUP BY hygf_unit_info.amos_company_code,hygf_unit_info.`name`
     </select>
 
+    <select id="getDealerNew"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
+        SELECT  hygf_unit_info.`name`,  hygf_unit_info.sequence_nbr  orgCode
 
+        FROM hygf_regional_companies LEFT JOIN hygf_unit_info
+        ON hygf_unit_info.sequence_nbr=hygf_regional_companies.unit_info_id  WHERE hygf_unit_info.audit_status='2'
+        AND hygf_unit_info.blacklist='0' AND hygf_unit_info.is_delete='0'
+        <if test="regionalCompaniesSeq!=null">
+            and hygf_regional_companies.regional_companies_seq =#{regionalCompaniesSeq}
+        </if>
+        and hygf_unit_info.amos_company_code is not null
+        GROUP BY hygf_unit_info.sequence_nbr,hygf_unit_info.`name`
+    </select>
 
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/MaintenanceFileMapper.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.mapper.MaintenanceFileMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/MaintenanceLogMapper.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.mapper.MaintenanceLogMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/MaintenanceMapper.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.mapper.MaintenanceMapper">
+
+    <update id="updateTraining">
+    update hygf_maintenance set training_status = '已培训' where foundation_id = (
+        select  sequence_nbr from  std_user_biz where amos_user_id = #{userId}
+    ) and is_delete = 0
+    </update>
+    <update id="updateTrainingAgreement">
+        update hygf_maintenance set is_sign_an_agreement = 0 where foundation_id = (
+            select  sequence_nbr from  std_user_biz where amos_user_id = #{userId}
+        ) and is_delete = 0
+    </update>
+
+
+    <select id="selectauthLogininfo" resultType="INT">
+
+
+    select COUNT(privilege_agency_user.SEQUENCE_NBR ) from  privilege_agency_user where
+    privilege_agency_user.MOBILE=#{telephone}
+    or privilege_agency_user.USER_NAME=#{telephone}
+    or privilege_agency_user.USER_NAME=#{adminLoginName}
+
+
+</select>
+    <select id="selectMaintenance" resultType="INT">
+     select COUNT(hygf_maintenance.SEQUENCE_NBR ) from
+
+ hygf_maintenance  LEFT JOIN std_user_biz on hygf_maintenance.foundation_id=std_user_biz.sequence_nbr
+
+ where
+    hygf_maintenance.review_status!='驳回'
+    and ( std_user_biz.emergency_telephone=#{telephone}
+    or std_user_biz.amos_user_name=#{adminLoginName})
+</select>
+
+
+    <select id="Maintenancepage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto">
+
+        select
+        ph.*,
+        std_user_biz.real_name name,
+        std_user_biz.emergency_telephone   telephone,
+        std_user_biz.id_type idType,
+        std_user_biz.id_number idCard,
+        std_user_biz.amos_user_name  adminLoginName,
+        std_user_biz.password   adminLoginPwd,
+        std_user_biz.amos_user_id    amosUserId,
+        CASE WHEN std_user_biz.lock_status  = 'UNLOCK' THEN '否'
+        ELSE '是' END AS lockStatus,
+        std_user_biz.id_card_front    idCardFront,
+        std_user_biz.id_card_opposite    idCardOpposite,
+        std_user_biz.amos_org_code   amosDealerCode,
+        std_user_biz.amos_id    amosDealerId
+
+        from  hygf_maintenance ph  LEFT JOIN std_user_biz on ph.foundation_id=std_user_biz.sequence_nbr
+
+        <where>
+            ph.is_delete = 0
+
+            <if test="name != null and name != ''">
+                AND std_user_biz.real_name LIKE CONCAT('%', #{name}, '%')
+            </if>
+
+            <if test="maintenanceTypeCode != null and maintenanceTypeCode != ''">
+                AND ph.maintenance_type_code = #{maintenanceTypeCode}
+            </if>
+            <if test="maintenanceType != null and maintenanceType != ''">
+                AND ph.maintenance_type = #{maintenanceType}
+            </if>
+            <if test="maintenanceAreaAddress != null and maintenanceAreaAddress != ''">
+                AND ph.maintenance_area_address LIKE CONCAT('%', #{maintenanceAreaAddress}, '%')
+            </if>
+            <if test="lockStatus != null and lockStatus != ''">
+                AND std_user_biz.lock_status = #{lockStatus}
+            </if>
+            <if test="reviewStatus != null and reviewStatus != ''">
+                AND ph.review_status = #{reviewStatus}
+            </if>
+
+            <if test="regionalCompaniesSeq != null and regionalCompaniesSeq != ''">
+                AND ph.regional_companies_seq = #{regionalCompaniesSeq}
+            </if>
+            <if test="dealerId != null and dealerId != ''">
+                AND ph.dealer_id = #{dealerId}
+            </if>
+
+        </where>
+
+
+    </select>
+
+
+
+    <select id="selectOneById" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto">
+
+        select
+        ph.*,
+        std_user_biz.real_name name,
+        std_user_biz.emergency_telephone   telephone,
+        std_user_biz.id_type idType,
+        std_user_biz.id_number idCard,
+        std_user_biz.amos_user_name  adminLoginName,
+        std_user_biz.password   adminLoginPwd,
+        std_user_biz.amos_user_id    amosUserId,
+        std_user_biz.lock_status   lockStatus,
+        std_user_biz.id_card_front    idCardFront,
+        std_user_biz.id_card_opposite    idCardOpposite,
+        std_user_biz.amos_org_code   amosDealerCode,
+        std_user_biz.amos_id    amosDealerId
+        from  hygf_maintenance ph  LEFT JOIN std_user_biz on ph.foundation_id=std_user_biz.sequence_nbr
+        where   ph.is_delete = 0  and  ph.sequence_nbr=#{sequenceNbr}
+
+    </select>
+
+
+    <select id="getTrainingAgreement" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto">
+
+        select
+        ph.*,
+        std_user_biz.real_name name,
+        std_user_biz.emergency_telephone   telephone,
+        std_user_biz.id_type idType,
+        std_user_biz.id_number idCard,
+        std_user_biz.amos_user_name  adminLoginName,
+        std_user_biz.password   adminLoginPwd,
+        std_user_biz.amos_user_id    amosUserId,
+        std_user_biz.lock_status   lockStatus,
+        std_user_biz.id_card_front    idCardFront,
+        std_user_biz.id_card_opposite    idCardOpposite,
+        std_user_biz.amos_org_code   amosDealerCode,
+        std_user_biz.amos_id    amosDealerId
+        from  hygf_maintenance ph  LEFT JOIN std_user_biz on ph.foundation_id=std_user_biz.sequence_nbr
+        where   ph.is_delete = 0  and  std_user_biz.amos_user_id=#{userId}
+
+    </select>
+
+
+    <select id="queryList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto">
+        select
+        ph.*,
+        std_user_biz.real_name name,
+        std_user_biz.emergency_telephone   telephone,
+        std_user_biz.id_type idType,
+        std_user_biz.id_number idCard,
+        std_user_biz.amos_user_name  adminLoginName,
+        std_user_biz.password   adminLoginPwd,
+        std_user_biz.amos_user_id    amosUserId,
+        CASE WHEN std_user_biz.lock_status  = 'UNLOCK' THEN '否'
+        ELSE '是' END AS lockStatus,
+        std_user_biz.id_card_front    idCardFront,
+        std_user_biz.id_card_opposite    idCardOpposite,
+        std_user_biz.amos_org_code   amosDealerCode,
+        std_user_biz.amos_id    amosDealerId
+
+        from  hygf_maintenance ph  LEFT JOIN std_user_biz on ph.foundation_id=std_user_biz.sequence_nbr
+
+        <where>
+            ph.is_delete = 0 and ph.review_status='通过' and  ph.training_status='已培训'  and  ph.is_sign_an_agreement=0
+
+
+            <if test="maintenanceType != null and maintenanceType != ''">
+                AND ph.maintenance_type = #{maintenanceType}
+            </if>
+            <if test="name != null and name != ''">
+                and 	(
+                     std_user_biz.real_name LIKE CONCAT('%', #{name}, '%')
+                or   ph.maintenance_area like CONCAT('%', #{name}, '%')
+                or   ph.maintenance_area_address like CONCAT('%', #{name}, '%')
+                or   ph.permanent_address_detail like CONCAT('%', #{name}, '%')
+                or   ph.permanent_address_name like CONCAT('%', #{name}, '%'))
+            </if>
+
+        </where>
+    </select>
+
+
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/MaintenanceTrainingMapper.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.mapper.MaintenanceTrainingMapper">
+
+    <select id="selectTrainingStatus" resultType="java.util.Map">
+        SELECT
+            count(ht.sequence_nbr) as total,
+            count(hmt.sequence_nbr) as num
+        FROM
+            hygf_training AS ht
+                LEFT JOIN hygf_maintenance_training hmt ON hmt.training_id = ht.sequence_nbr AND hmt.user_id = #{userId}
+    </select>
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/TrainingMapper.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.mapper.TrainingMapper">
+
+    <select id="currentStudyStatusList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.TrainingDto">
+        select * from (SELECT
+        ht.*,
+        (select  COUNT(hmt.sequence_nbr) from hygf_maintenance_training  hmt where hmt.training_id = ht.sequence_nbr and hmt.user_id = #{userId} )
+        as status
+        FROM
+        hygf_training AS ht
+        )  hh
+
+        where hh.is_delete=0
+        <if test="status!=null ">
+           and hh.status =#{status}
+        </if>
+        <if test="name!=null and name!='' ">
+            and hh.name like concat(concat("%",#{name}),"%")
+        </if>
+    </select>
+</mapper>

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

@@ -31,7 +31,10 @@
        <if test="dto.regionCompanyId!=null and dto.regionCompanyId!=''">
            and hygf_work_order.region_company_id =#{dto.regionCompanyId}
        </if>
-       ORDER BY hygf_work_order.rec_date DESC
+       ORDER BY
+       FIELD(hygf_work_order.work_order_status, '待施工', '施工中', '待登记', '登记中', '待审核', '审核中', '未通过', '已完工'),
+
+       hygf_work_order.rec_date DESC
 
    </select>
 
@@ -95,7 +98,11 @@
         <if test="dto.regionCompanyId!=null and dto.regionCompanyId!=''">
             and hygf_work_order.region_company_id =#{dto.regionCompanyId}
         </if>
-        ORDER BY hygf_work_order_power_station.rec_date DESC
+        ORDER BY
+
+        FIELD(hygf_work_order_power_station.power_station_construction_status, '待施工', '施工中', '待登记', '登记中', '待审核', '审核中', '未通过', '已完工'),
+
+        hygf_work_order_power_station.rec_date DESC
     </where>
 
     </select>

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

@@ -33,6 +33,12 @@
                    #{item}
                </foreach>
 		    </if>
+			<if test="param.listHandlerStatus!=null">
+				AND handler_status IN
+				<foreach collection="param.listHandlerStatus" item="item" index="index" open="(" separator="," close=")">
+					#{item}
+				</foreach>
+			</if>
 		</where>
 
         order by  start_time DESC
@@ -61,12 +67,16 @@
 		recover_time,
 		treatment,
 		time_long,
-		recover_time as recoverTimeString
+		recover_time as recoverTimeString,
+		handler_status as handlerStatus
 		FROM house_pv_data.td_hygf_jp_inverter_warn
 		<where>
 			<if test="state != null and state != ''">
 				AND `state` = #{state}
 			</if>
+			<if test="handlerStatus != null and handlerStatus != ''">
+				AND handler_status = #{handlerStatus}
+			</if>
 			<if test="level != null and level != ''">
 				AND `level` = #{level}
 			</if>
@@ -106,7 +116,10 @@
 		FROM house_pv_data.td_hygf_jp_inverter_warn
 		<where>
 			<if test="state != null and state != ''">
-				AND `state` = #{state}
+				AND handler_status = #{state}
+			</if>
+			<if test="handlerStatus != null and handlerStatus != ''">
+				AND handler_status = #{handlerStatus}
 			</if>
 			<if test="level != null and level != ''">
 				AND level = #{level}

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+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.dto.HYGFMaintenanceTicketsDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HYGFMaintenanceTickets;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HYGFMaintenanceTicketsServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 运维工单
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@RestController
+@Api(tags = "运维工单Api")
+@RequestMapping(value = "/maintenanceTickets")
+public class HYGFMaintenanceTicketsController extends BaseController {
+
+    @Autowired
+	HYGFMaintenanceTicketsServiceImpl hygfMaintenanceTicketsServiceimpl;
+
+    /**
+     * 新增运维工单
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增运维工单", notes = "新增运维工单")
+	public ResponseModel<HYGFMaintenanceTicketsDto> save(@RequestBody HYGFMaintenanceTicketsDto model) {
+	   hygfMaintenanceTicketsServiceimpl.sendMeassageToMcb(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/update")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新运维工单", notes = "根据sequenceNbr更新运维工单")
+	public ResponseModel<HYGFMaintenanceTicketsDto> updateBySequenceNbrMaintenance(@RequestBody HYGFMaintenanceTicketsDto model) {
+	    return ResponseHelper.buildResponse(hygfMaintenanceTicketsServiceimpl.updateHYGFMaintenanceTicketsDto(model));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@PostMapping(value = "/updateScore")
+	@ApiOperation(httpMethod = "POST", value = "工单打分", notes = "工单打分")
+	public ResponseModel<HYGFMaintenanceTickets> updateScoreBySequenceNbrMaintenance(@RequestParam(value="sequenceNbr",required = true) Long sequenceNbr,@RequestParam(value="score",required = true) String score) {
+         hygfMaintenanceTicketsServiceimpl.getBaseMapper().updateScoreBySequenceNbr(score,sequenceNbr);
+		return ResponseHelper.buildResponse(hygfMaintenanceTicketsServiceimpl.getBaseMapper().selectById(sequenceNbr));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除运维工单", notes = "根据sequenceNbr删除运维工单")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(hygfMaintenanceTicketsServiceimpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "/getDeatil")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个运维工单",  notes = "根据sequenceNbr查询单个运维工单")
+	public ResponseModel<HYGFMaintenanceTickets> selectOne(@RequestParam Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(hygfMaintenanceTicketsServiceimpl.getDetailBySequenceNbr(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "运维工单分页查询",  notes = "运维工单分页查询")
+	public ResponseModel<Page<HYGFMaintenanceTicketsDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size, HYGFMaintenanceTicketsDto hygfMaintenanceTicketsDto) {
+
+	    return ResponseHelper.buildResponse(hygfMaintenanceTicketsServiceimpl.queryForHYGFMaintenanceTicketsDtoPage(current,size,hygfMaintenanceTicketsDto));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "运维工单列表全部数据查询",   notes = "运维工单列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<HYGFMaintenanceTicketsDto>> selectForList() {
+	    return ResponseHelper.buildResponse(hygfMaintenanceTicketsServiceimpl.queryHYGFMaintenanceTicketsDtoList());
+	}
+	/**
+	 * 列表全部数据查询
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@ApiOperation(httpMethod = "GET",value = "根据场站id获取sncode列表",   notes = "根据场站id获取sncode列表")
+	@GetMapping(value = "/queryInverterSncodesByStationId")
+	public ResponseModel<List<String>> queryInverterSncodesByStationId(@RequestParam(value = "stationId") String stationId){
+		return ResponseHelper.buildResponse(hygfMaintenanceTicketsServiceimpl.queryInverterSncodesByStationId(stationId));
+	}
+}

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

@@ -36,6 +36,14 @@ import java.util.stream.Collectors;
 @RequestMapping(value = "/jp-station")
 public class JpStationController extends BaseController {
 
+    private static Double CARBON = 0.997 * 0.001;
+    private static Double SULFUR = 0.03 * 0.001;
+    private static Double DUST = 0.272 * 0.001;
+    private static Double COAL = 0.4 * 0.001;
+    private static String ZX = "在线";
+    private static String LX = "离线";
+    private static String BJ = "报警";
+    private static int FDXSS = 1000;
     @Autowired
     JpStationServiceImpl jpStationServiceImpl;
     @Autowired
@@ -46,48 +54,39 @@ public class JpStationController extends BaseController {
     JpCollectorMapper jpCollectorMapper;
     @Autowired
     JpInverterMapper jpInverterMapper;
-
     @Autowired
     DayGenerateServiceImpl dayGenerateServiceImpl;
     @Autowired
     RegionalCompaniesMapper regionalCompaniesMapper;
 
-    private static Double CARBON=0.997*0.001;
-    private static Double SULFUR=0.03*0.001;
-    private static Double DUST=0.272*0.001;
-    private static Double COAL=0.4*0.001;
-    private static String ZX="在线";
-    private static String LX="离线";
-    private static String BJ="报警";
-    private static int FDXSS=1000;
     /**
      * 新增第三方场站
      *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增第三方场站", notes = "新增第三方场站")
-	public ResponseModel<JpStationDto> save(@RequestBody JpStationDto model) {
-	    model = jpStationServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
-
-	/**
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增第三方场站", notes = "新增第三方场站")
+    public ResponseModel<JpStationDto> save(@RequestBody JpStationDto model) {
+        model = jpStationServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
      * 根据sequenceNbr更新
      *
      * @param sequenceNbr 主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新第三方场站", notes = "根据sequenceNbr更新第三方场站")
-	public ResponseModel<JpStationDto> updateBySequenceNbrJpStation(@RequestBody JpStationDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(jpStationServiceImpl.updateWithModel(model));
-	}
-
-	/**
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新第三方场站", notes = "根据sequenceNbr更新第三方场站")
+    public ResponseModel<JpStationDto> updateBySequenceNbrJpStation(@RequestBody JpStationDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(jpStationServiceImpl.updateWithModel(model));
+    }
+
+    /**
      * 根据sequenceNbr删除
      *
      * @param sequenceNbr 主键
@@ -96,28 +95,28 @@ public class JpStationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除第三方场站", notes = "根据sequenceNbr删除第三方场站")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(jpStationServiceImpl.removeById(sequenceNbr));
     }
 
     /**
      * 根据sequenceNbr查询
      *
-	 * @param sequenceNbr  主键
+     * @param sequenceNbr 主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/getBysequenceNbr")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个第三方场站",  notes = "根据sequenceNbr查询单个第三方场站")
-	public ResponseModel<JpStationDto> selectOne( String id) {
-	    Long sequenceNbr=Long.valueOf(id);
-        JpStationDto jpStationDto=  jpStationServiceImpl.queryBySeq(sequenceNbr);
-        LambdaQueryWrapper<JpInverter> qug=new LambdaQueryWrapper<>();
-        qug.eq(JpInverter::getThirdStationId,jpStationDto.getThirdStationId());
-        List<JpInverter> jpInverter=jpInverterMapper.selectList(qug);
-        LambdaQueryWrapper<JpCollector> qug1=new LambdaQueryWrapper<>();
-        qug1.eq(JpCollector::getThirdStationId,jpStationDto.getThirdStationId());
-        List<JpCollector> jpCollector=jpCollectorMapper.selectList(qug1);
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getBysequenceNbr")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个第三方场站", notes = "根据sequenceNbr查询单个第三方场站")
+    public ResponseModel<JpStationDto> selectOne(String id) {
+        Long sequenceNbr = Long.valueOf(id);
+        JpStationDto jpStationDto = jpStationServiceImpl.queryBySeq(sequenceNbr);
+        LambdaQueryWrapper<JpInverter> qug = new LambdaQueryWrapper<>();
+        qug.eq(JpInverter::getThirdStationId, jpStationDto.getThirdStationId());
+        List<JpInverter> jpInverter = jpInverterMapper.selectList(qug);
+        LambdaQueryWrapper<JpCollector> qug1 = new LambdaQueryWrapper<>();
+        qug1.eq(JpCollector::getThirdStationId, jpStationDto.getThirdStationId());
+        List<JpCollector> jpCollector = jpCollectorMapper.selectList(qug1);
         jpStationDto.setJpCollector(jpCollector);
         jpStationDto.setJpInverter(jpInverter);
 //        //区域公司
@@ -130,33 +129,33 @@ public class JpStationController extends BaseController {
 //        jpStationDto.setNBSN(name);
 //        jpStationDto.setCJSN(names);
 //        jpStationDto.setRegionalCompaniesName(personnelBusiness.getRegionalCompaniesName());
-	    return ResponseHelper.buildResponse(jpStationDto);
-	}
+        return ResponseHelper.buildResponse(jpStationDto);
+    }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getBysequenceNbrnew")
-    @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个第三方场站",  notes = "根据sequenceNbr查询单个第三方场站")
-    public ResponseModel<JpStationDto> selectOneThirdStationId( String id) {
-
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个第三方场站", notes = "根据sequenceNbr查询单个第三方场站")
+    public ResponseModel<JpStationDto> selectOneThirdStationId(String id) {
 
 
-	    LambdaQueryWrapper<JpStation> qug3=new LambdaQueryWrapper<>();
-        qug3.eq(JpStation::getThirdStationId,id);
-        JpStation JpStation=jpStationMapper.selectOne(qug3);
+        LambdaQueryWrapper<JpStation> qug3 = new LambdaQueryWrapper<>();
+        qug3.eq(JpStation::getThirdStationId, id);
+        JpStation JpStation = jpStationMapper.selectOne(qug3);
 
-        JpStationDto jpStationDto=  jpStationServiceImpl.queryBySeq(JpStation.getSequenceNbr());
-        LambdaQueryWrapper<JpInverter> qug=new LambdaQueryWrapper<>();
-        qug.eq(JpInverter::getThirdStationId,jpStationDto.getThirdStationId());
-        List<JpInverter> jpInverter=jpInverterMapper.selectList(qug);
-        LambdaQueryWrapper<JpCollector> qug1=new LambdaQueryWrapper<>();
-        qug1.eq(JpCollector::getThirdStationId,jpStationDto.getThirdStationId());
-        List<JpCollector> jpCollector=jpCollectorMapper.selectList(qug1);
+        JpStationDto jpStationDto = jpStationServiceImpl.queryBySeq(JpStation.getSequenceNbr());
+        LambdaQueryWrapper<JpInverter> qug = new LambdaQueryWrapper<>();
+        qug.eq(JpInverter::getThirdStationId, jpStationDto.getThirdStationId());
+        List<JpInverter> jpInverter = jpInverterMapper.selectList(qug);
+        LambdaQueryWrapper<JpCollector> qug1 = new LambdaQueryWrapper<>();
+        qug1.eq(JpCollector::getThirdStationId, jpStationDto.getThirdStationId());
+        List<JpCollector> jpCollector = jpCollectorMapper.selectList(qug1);
         jpStationDto.setJpCollector(jpCollector);
         jpStationDto.setJpInverter(jpInverter);
         //区域公司
-        LambdaQueryWrapper<RegionalCompanies> qug2=new LambdaQueryWrapper<>();
-        qug2.eq(RegionalCompanies::getRegionalCompaniesCode,jpStationDto.getRegionalCompaniesCode());
+        LambdaQueryWrapper<RegionalCompanies> qug2 = new LambdaQueryWrapper<>();
+        qug2.eq(RegionalCompanies::getRegionalCompaniesCode, jpStationDto.getRegionalCompaniesCode());
         qug2.last("LIMIT 1");
-        RegionalCompanies  personnelBusiness= regionalCompaniesMapper.selectOne(qug2);
+        RegionalCompanies personnelBusiness = regionalCompaniesMapper.selectOne(qug2);
         String names = jpCollector.stream().map(JpCollector::getSnCode).collect(Collectors.joining(","));
         String name = jpInverter.stream().map(JpInverter::getSnCode).collect(Collectors.joining(","));
         jpStationDto.setNbsn(name);
@@ -165,7 +164,8 @@ public class JpStationController extends BaseController {
         jpStationDto.setRegionalCompaniesName(personnelBusiness.getRegionalCompaniesName());
         return ResponseHelper.buildResponse(jpStationDto);
     }
-	/**
+
+    /**
      * 列表分页查询
      *
      * @param current 当前页
@@ -175,282 +175,281 @@ public class JpStationController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/queryPage")
-    @ApiOperation(httpMethod = "GET",value = "场站列表",  notes = "场站列表")
+    @ApiOperation(httpMethod = "GET", value = "场站列表", notes = "场站列表")
     public ResponseModel<Page<JpStationDto>> queryForDealerReviewPage(@RequestParam(value = "current") int current, @RequestParam
             (value = "size") int size, JpStationDto reviewDto) {
 
-        List<JpPersonStation> pPersonStation=null;
-        if(reviewDto.getName()!=null&&!"".equals(reviewDto.getName())){
-            LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
-            qug1.like(JpPersonStation::getStationName,reviewDto.getName());
-            pPersonStation=pPersonStationMapper.selectList(qug1);
-        }else{
+        List<JpPersonStation> pPersonStation = null;
+        if (reviewDto.getName() != null && !"".equals(reviewDto.getName())) {
+            LambdaQueryWrapper<JpPersonStation> qug1 = new LambdaQueryWrapper<>();
+            qug1.like(JpPersonStation::getStationName, reviewDto.getName());
+            pPersonStation = pPersonStationMapper.selectList(qug1);
+        } else {
             //获取当前人管理场站
             //获取当前人管理场站
-            LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
-            qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
-             pPersonStation=pPersonStationMapper.selectList(qug);
+            LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+            qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+            pPersonStation = pPersonStationMapper.selectList(qug);
         }
 
 
 //        if(reviewDto.getThirdStationId()==null){
 
-            if(pPersonStation!=null&&!pPersonStation.isEmpty()){
-                reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
-            }else{
-                return ResponseHelper.buildResponse(null);
-            }
+        if (pPersonStation != null && !pPersonStation.isEmpty()) {
+            reviewDto.setStatioId(pPersonStation.isEmpty() ? null : pPersonStation);
+        } else {
+            return ResponseHelper.buildResponse(null);
+        }
 //        }
-        Page<JpStationDto> page=jpStationServiceImpl.queryForJpStationPage(current,size,reviewDto);
+        Page<JpStationDto> page = jpStationServiceImpl.queryForJpStationPage(current, size, reviewDto);
         return ResponseHelper.buildResponse(page);
     }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/countState")
-    @ApiOperation(httpMethod = "GET",value = "场站列表",  notes = "场站列表")
-    public ResponseModel< Map<String,Object> > countState(JpStationDto reviewDto) {
-
-        Set<String> se=new HashSet<>();
-        List<JpPersonStation> pPersonStation=null;
-        if(reviewDto.getName()!=null&&!"".equals(reviewDto.getName())){
-            LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
-            qug1.like(JpPersonStation::getStationName,reviewDto.getName());
-             pPersonStation=pPersonStationMapper.selectList(qug1);
-        }else{
+    @ApiOperation(httpMethod = "GET", value = "场站列表", notes = "场站列表")
+    public ResponseModel<Map<String, Object>> countState(JpStationDto reviewDto) {
+
+        Set<String> se = new HashSet<>();
+        List<JpPersonStation> pPersonStation = null;
+        if (reviewDto.getName() != null && !"".equals(reviewDto.getName())) {
+            LambdaQueryWrapper<JpPersonStation> qug1 = new LambdaQueryWrapper<>();
+            qug1.like(JpPersonStation::getStationName, reviewDto.getName());
+            pPersonStation = pPersonStationMapper.selectList(qug1);
+        } else {
             //获取当前人管理场站
-            LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
-            qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
-             pPersonStation=pPersonStationMapper.selectList(qug);
+            LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+            qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+            pPersonStation = pPersonStationMapper.selectList(qug);
         }
-        reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
-        List<Map<String,Object>> list= jpStationMapper.countState(reviewDto);
-        Map<String,Object>  collector =new HashMap<>();
-        collector.put("zx",0);
-        collector.put("bj",0);
-        collector.put("lx",0);
-            if(list!=null&&!list.isEmpty()){
-                for (Map<String, Object> map : list) {
-                    if("在线".equals(map.get("state").toString())){
-                        collector.put("zx",Integer.valueOf(map.get("num").toString()));
-                    }else if("离线".equals(map.get("state").toString())){
-                        collector.put("lx",Integer.valueOf(map.get("num").toString()));
-                    }else if("报警".equals(map.get("state").toString())){
-                        collector.put("bj",Integer.valueOf(map.get("num").toString()));
-                    }
+        reviewDto.setStatioId(pPersonStation.isEmpty() ? null : pPersonStation);
+        List<Map<String, Object>> list = jpStationMapper.countState(reviewDto);
+        Map<String, Object> collector = new HashMap<>();
+        collector.put("zx", 0);
+        collector.put("bj", 0);
+        collector.put("lx", 0);
+        if (list != null && !list.isEmpty()) {
+            for (Map<String, Object> map : list) {
+                if ("在线".equals(map.get("state").toString())) {
+                    collector.put("zx", Integer.valueOf(map.get("num").toString()));
+                } else if ("离线".equals(map.get("state").toString())) {
+                    collector.put("lx", Integer.valueOf(map.get("num").toString()));
+                } else if ("报警".equals(map.get("state").toString())) {
+                    collector.put("bj", Integer.valueOf(map.get("num").toString()));
                 }
             }
+        }
         return ResponseHelper.buildResponse(collector);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getpStation")
-    @ApiOperation(httpMethod = "GET",value = "设备监控",  notes = "设备监控")
-    public ResponseModel<Map<String,Object>> getpStation(JpStationDto reviewDto) {
-
-        List<JpPersonStation> pPersonStation=null;
-        if(reviewDto.getName()!=null&&!"".equals(reviewDto.getName())){
-            LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
-            qug1.like(JpPersonStation::getStationName,reviewDto.getName());
-            pPersonStation=pPersonStationMapper.selectList(qug1);
-        }else{
+    @ApiOperation(httpMethod = "GET", value = "设备监控", notes = "设备监控")
+    public ResponseModel<Map<String, Object>> getpStation(JpStationDto reviewDto) {
+
+        List<JpPersonStation> pPersonStation = null;
+        if (reviewDto.getName() != null && !"".equals(reviewDto.getName())) {
+            LambdaQueryWrapper<JpPersonStation> qug1 = new LambdaQueryWrapper<>();
+            qug1.like(JpPersonStation::getStationName, reviewDto.getName());
+            pPersonStation = pPersonStationMapper.selectList(qug1);
+        } else {
             //获取当前人管理场站
-            LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
-            qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
-            pPersonStation=pPersonStationMapper.selectList(qug);
+            LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+            qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+            pPersonStation = pPersonStationMapper.selectList(qug);
         }
 
 
-
-        if(pPersonStation!=null&&!pPersonStation.isEmpty()){
-            reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
-        }else{
+        if (pPersonStation != null && !pPersonStation.isEmpty()) {
+            reviewDto.setStatioId(pPersonStation.isEmpty() ? null : pPersonStation);
+        } else {
             return ResponseHelper.buildResponse(null);
         }
-        List<Map<String,Object>>  listCollector=  jpCollectorMapper.queryCollectorCountStatus(reviewDto);
-        List<Map<String,Object>>  listInverter=  jpInverterMapper.queryInverterCountStatus(reviewDto);
-        Map<String,Object>  collector =new HashMap<>();
-        collector.put("zx",0);
-        collector.put("gj",0);
-        collector.put("lx",0);
-        Map<String,Object>  inverter =new HashMap<>();
-        inverter.put("zx",0);
-        inverter.put("gj",0);
-        inverter.put("lx",0);
-        if(!listCollector.isEmpty()){
+        List<Map<String, Object>> listCollector = jpCollectorMapper.queryCollectorCountStatus(reviewDto);
+        List<Map<String, Object>> listInverter = jpInverterMapper.queryInverterCountStatus(reviewDto);
+        Map<String, Object> collector = new HashMap<>();
+        collector.put("zx", 0);
+        collector.put("gj", 0);
+        collector.put("lx", 0);
+        Map<String, Object> inverter = new HashMap<>();
+        inverter.put("zx", 0);
+        inverter.put("gj", 0);
+        inverter.put("lx", 0);
+        if (!listCollector.isEmpty()) {
             for (Map<String, Object> map : listCollector) {
-                if("在线".equals(map.get("state").toString())){
-                    collector.put("zx",Integer.valueOf(map.get("num").toString()));
-                }else if("离线".equals(map.get("state").toString())){
-                    collector.put("lx",Integer.valueOf(map.get("num").toString()));
-                }else if("报警".equals(map.get("state").toString())){
-                    collector.put("gj",Integer.valueOf(map.get("num").toString()));
+                if ("在线".equals(map.get("state").toString())) {
+                    collector.put("zx", Integer.valueOf(map.get("num").toString()));
+                } else if ("离线".equals(map.get("state").toString())) {
+                    collector.put("lx", Integer.valueOf(map.get("num").toString()));
+                } else if ("报警".equals(map.get("state").toString())) {
+                    collector.put("gj", Integer.valueOf(map.get("num").toString()));
                 }
             }
         }
-        if(!listInverter.isEmpty()){
+        if (!listInverter.isEmpty()) {
             for (Map<String, Object> map : listInverter) {
-                if("在线".equals(map.get("state").toString())){
-                    inverter.put("zx",Integer.valueOf(map.get("num").toString()));
-                }else if("离线".equals(map.get("state").toString())){
-                    inverter.put("lx",Integer.valueOf(map.get("num").toString()));
-                }else if("报警".equals(map.get("state").toString())){
-                    inverter.put("gj",Integer.valueOf(map.get("num").toString()));
+                if ("在线".equals(map.get("state").toString())) {
+                    inverter.put("zx", Integer.valueOf(map.get("num").toString()));
+                } else if ("离线".equals(map.get("state").toString())) {
+                    inverter.put("lx", Integer.valueOf(map.get("num").toString()));
+                } else if ("报警".equals(map.get("state").toString())) {
+                    inverter.put("gj", Integer.valueOf(map.get("num").toString()));
                 }
             }
         }
-        Map<String,Object> map=new HashMap<>();
-        map.put("collector",collector);
-        map.put("inverter",inverter);
+        Map<String, Object> map = new HashMap<>();
+        map.put("collector", collector);
+        map.put("inverter", inverter);
         return ResponseHelper.buildResponse(map);
 
     }
 
 
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/queryListcz")
-    @ApiOperation(httpMethod = "GET",value = "登陆人管理场站列表",  notes = "登陆人管理场站列表")
-    public ResponseModel<List<JpPersonStation>> queryList( ) {
-            //获取当前人管理场站
-            LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
-            qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
-            List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
+    @ApiOperation(httpMethod = "GET", value = "登陆人管理场站列表", notes = "登陆人管理场站列表")
+    public ResponseModel<List<JpPersonStation>> queryList() {
+        //获取当前人管理场站
+        LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+        qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+        List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug);
         return ResponseHelper.buildResponse(pPersonStation);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/queryUserListyz")
-    @ApiOperation(httpMethod = "GET",value = "登陆人管理场站业主列表",  notes = "登陆人管理场站业主列表")
-    public ResponseModel<List<String>> queryUserList( ) {
+    @ApiOperation(httpMethod = "GET", value = "登陆人管理场站业主列表", notes = "登陆人管理场站业主列表")
+    public ResponseModel<List<String>> queryUserList() {
         //获取当前人管理场站
-        LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
-        qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
-        List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
-        List data=new ArrayList();
-       if(pPersonStation!=null&& !pPersonStation.isEmpty()){
-           for (JpPersonStation jpPersonStation : pPersonStation) {
-               data.add(jpPersonStation.getOwner());
-           }
-       }
+        LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+        qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+        List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug);
+        List data = new ArrayList();
+        if (pPersonStation != null && !pPersonStation.isEmpty()) {
+            for (JpPersonStation jpPersonStation : pPersonStation) {
+                data.add(jpPersonStation.getOwner());
+            }
+        }
         return ResponseHelper.buildResponse(data);
     }
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "电站监控电量收益",   notes = "电站监控电量收益")
+    @ApiOperation(httpMethod = "GET", value = "电站监控电量收益", notes = "电站监控电量收益")
     @GetMapping(value = "/getIncomePower")
     public ResponseModel<JpStationDto> getIncomePower(JpStationDto reviewDto) {
         //获取当前人管理场站
-        if(reviewDto.getThirdStationId()==null){
+        if (reviewDto.getThirdStationId() == null) {
             //获取当前人管理场站
-            LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
-            qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
-            List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
-            if(pPersonStation!=null&&!pPersonStation.isEmpty()){
-                reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
-            }else{
-                return  ResponseHelper.buildResponse(null);
+            LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+            qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+            List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug);
+            if (pPersonStation != null && !pPersonStation.isEmpty()) {
+                reviewDto.setStatioId(pPersonStation.isEmpty() ? null : pPersonStation);
+            } else {
+                return ResponseHelper.buildResponse(null);
             }
-      }
+        }
         return ResponseHelper.buildResponse(jpStationMapper.queryCount(reviewDto));
     }
 
 
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "工率曲线",   notes = "电站监控电量收益")
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "工率曲线", notes = "电站监控电量收益")
     @GetMapping(value = "/getPowerqx")
-    public ResponseModel< Map<String, List<Object>>> getPowerqx(JpStationDto reviewDto,String date, String type) {
+    public ResponseModel<Map<String, List<Object>>> getPowerqx(JpStationDto reviewDto, String date, String type) {
         //获取当前人管理场站
-        List<String> data=new ArrayList();
-        Set<String> se=new HashSet<>();
-        if(reviewDto.getName()!=null){
-            LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
-            qug1.like(JpPersonStation::getStationName,reviewDto.getName());
-            List<JpPersonStation> pPersonStation1=pPersonStationMapper.selectList(qug1);
-            if(pPersonStation1!=null&&!pPersonStation1.isEmpty()){
+        List<String> data = new ArrayList();
+        Set<String> se = new HashSet<>();
+        if (reviewDto.getName() != null) {
+            LambdaQueryWrapper<JpPersonStation> qug1 = new LambdaQueryWrapper<>();
+            qug1.like(JpPersonStation::getStationName, reviewDto.getName());
+            List<JpPersonStation> pPersonStation1 = pPersonStationMapper.selectList(qug1);
+            if (pPersonStation1 != null && !pPersonStation1.isEmpty()) {
                 for (JpPersonStation jpPersonStation : pPersonStation1) {
                     se.add(jpPersonStation.getStationId());
                 }
             }
             data.addAll(se);
-        }else{
-            if(reviewDto.getThirdStationId()==null){
+        } else {
+            if (reviewDto.getThirdStationId() == null) {
                 //获取当前人管理场站
-                LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
-                qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
-                List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
-                if(pPersonStation!=null&&!pPersonStation.isEmpty()){
+                LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+                qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+                List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug);
+                if (pPersonStation != null && !pPersonStation.isEmpty()) {
 
                     for (JpPersonStation jpPersonStation : pPersonStation) {
                         data.add(jpPersonStation.getStationId());
                     }
-                }else{
-                    return  ResponseHelper.buildResponse(null);
+                } else {
+                    return ResponseHelper.buildResponse(null);
                 }
-            }else{
+            } else {
                 data.add(reviewDto.getThirdStationId());
             }
         }
 
-        return ResponseHelper.buildResponse(jpStationServiceImpl.getPowerqx( date,  type,data));
+        return ResponseHelper.buildResponse(jpStationServiceImpl.getPowerqx(date, type, data));
     }
 
 
     //查询当前登录人权限区域公司
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "查询当前登录人权限区域公司",   notes = "查询当前登录人权限区域公司")
+    @ApiOperation(httpMethod = "GET", value = "查询当前登录人权限区域公司", notes = "查询当前登录人权限区域公司")
     @GetMapping(value = "/getRegion")
     @UserLimits
-    public ResponseModel<List<Map<String,String>>> getRegion() {
+    public ResponseModel<List<Map<String, String>>> getRegion() {
 
-        List<DropDown>  list=  jpStationMapper.getRegion();
-        List<Map<String,String>> result = new ArrayList<>();
+        List<DropDown> list = jpStationMapper.getRegion();
+        List<Map<String, String>> result = new ArrayList<>();
         list.forEach(dropDown -> {
-            Map<String,String> item = new HashMap<>();
-            item.put("text",dropDown.getName());
-            item.put("value",dropDown.getOrgCode());
+            Map<String, String> item = new HashMap<>();
+            item.put("text", dropDown.getName());
+            item.put("value", dropDown.getOrgCode());
             result.add(item);
         });
 
-         return ResponseHelper.buildResponse(result);
+        return ResponseHelper.buildResponse(result);
     }
 
 
     //查询当前登录人权限经销商
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "查询当前登录人权限经销商",   notes = "查询当前登录人权限经销商")
+    @ApiOperation(httpMethod = "GET", value = "查询当前登录人权限经销商", notes = "查询当前登录人权限经销商")
     @GetMapping(value = "/getDealer")
     @UserLimits
-    public ResponseModel<List<Map<String,String>>> getDealer(String regionalCompaniesCode ) {
-        List<DropDown>  list=  jpStationMapper.getDealer(regionalCompaniesCode);
-        List<Map<String,String>> result = new ArrayList<>();
+    public ResponseModel<List<Map<String, String>>> getDealer(String regionalCompaniesCode) {
+        List<DropDown> list = jpStationMapper.getDealer(regionalCompaniesCode);
+        List<Map<String, String>> result = new ArrayList<>();
         list.forEach(dropDown -> {
-            Map<String,String> item = new HashMap<>();
-            item.put("text",dropDown.getName());
-            item.put("value",dropDown.getOrgCode());
+            Map<String, String> item = new HashMap<>();
+            item.put("text", dropDown.getName());
+            item.put("value", dropDown.getOrgCode());
             result.add(item);
         });
         return ResponseHelper.buildResponse(result);
     }
 
-   //电站发电量统计
+    //电站发电量统计
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "电站发电量统计",   notes = "电站发电量统计")
+    @ApiOperation(httpMethod = "GET", value = "电站发电量统计", notes = "电站发电量统计")
     @GetMapping(value = "/getCountJpStationdata")
     @UserLimits
-    public ResponseModel< Page<JpStationDto>> getCountJpStationdata(JpStationDto reviewDto) {
-        JpStationDto jpStation= jpStationMapper.getCountJpStationdata(reviewDto);
-        List<Map<String,Object>> powerRatio=new ArrayList<>();
-        Map<String,Object> map=new HashMap<>();
-        if(jpStation!=null&&jpStation.getRealTimePower()!=null&&jpStation.getRatedPower()!=null&&jpStation.getRatedPower()>0){
-            map.put("value",String.format("%.4f",jpStation.getRealTimePower()/(jpStation.getCapacity()*FDXSS)));
-        }else{
-            jpStation=new JpStationDto();
-            map.put("value",0);
+    public ResponseModel<Page<JpStationDto>> getCountJpStationdata(JpStationDto reviewDto) {
+        JpStationDto jpStation = jpStationMapper.getCountJpStationdata(reviewDto);
+        List<Map<String, Object>> powerRatio = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        if (jpStation != null && jpStation.getRealTimePower() != null && jpStation.getRatedPower() != null && jpStation.getRatedPower() > 0) {
+            map.put("value", String.format("%.4f", jpStation.getRealTimePower() / (jpStation.getCapacity() * FDXSS)));
+        } else {
+            jpStation = new JpStationDto();
+            map.put("value", 0);
         }
         powerRatio.add(map);
         jpStation.setPowerRatio(powerRatio);
-        List<JpStationDto> list=new ArrayList<>();
+        List<JpStationDto> list = new ArrayList<>();
         list.add(jpStation);
         Page<JpStationDto> result = new Page<>();
         result.setCurrent(1);
@@ -459,36 +458,45 @@ public class JpStationController extends BaseController {
         return ResponseHelper.buildResponse(result);
     }
 
-   //电站分布
-   @TycloudOperation(ApiLevel = UserType.AGENCY)
-   @ApiOperation(httpMethod = "GET",value = "电站分布",   notes = "电站分布")
-   @GetMapping(value = "/getJpStation")
-   @UserLimits
-   public Object getJpStation(JpStationDto reviewDto) {
-       List<JpStation> list= jpStationMapper.getJpStation(reviewDto);
-       return ResponseHelper.buildResponse(list);
-   }
+    //电站分布
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "电站分布", notes = "电站分布")
+    @GetMapping(value = "/getJpStation")
+    @UserLimits
+    public Object getJpStation(JpStationDto reviewDto) {
+        List<JpStation> list = jpStationMapper.getJpStation(reviewDto);
+        return ResponseHelper.buildResponse(list);
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "电站场站无权限", notes = "电站场站无权限")
+    @GetMapping(value = "/getJpStationList")
+    public ResponseModel<List<JpStation>> getJpStationList(JpStationDto reviewDto) {
+
+        return ResponseHelper.buildResponse(jpStationServiceImpl.getJpStationList(reviewDto));
+    }
 
     //节能减排
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "节能减排",   notes = "节能减排")
+    @ApiOperation(httpMethod = "GET", value = "节能减排", notes = "节能减排")
     @GetMapping(value = "/getEnergyConservation")
     @UserLimits
-    public ResponseModel< Page<Map<String,Object>>> getEnergyConservation(JpStationDto reviewDto) {
-        Page<Map<String,Object>> result =new Page<>();
-        List<Map<String,Object>> itemList =new ArrayList<>();
-        JpStationDto jpStation= jpStationMapper.getCountJpStationdata(reviewDto);
-        Map<String,Object> map=new HashMap<>();
+    public ResponseModel<Page<Map<String, Object>>> getEnergyConservation(JpStationDto reviewDto) {
+        Page<Map<String, Object>> result = new Page<>();
+        List<Map<String, Object>> itemList = new ArrayList<>();
+        JpStationDto jpStation = jpStationMapper.getCountJpStationdata(reviewDto);
+        Map<String, Object> map = new HashMap<>();
         DecimalFormat format2 = new DecimalFormat("0.00");
         //炭
-        map.put("carbon",format2.format(jpStation.getAccumulatedPower()*FDXSS*CARBON));
+        map.put("carbon", format2.format(jpStation.getAccumulatedPower() * FDXSS * CARBON));
         //硫
-        map.put("sulfur",format2.format(jpStation.getAccumulatedPower()*FDXSS*SULFUR));
+        map.put("sulfur", format2.format(jpStation.getAccumulatedPower() * FDXSS * SULFUR));
         //粉尘
-        map.put("dust",format2.format(jpStation.getAccumulatedPower()*FDXSS*DUST));
+        map.put("dust", format2.format(jpStation.getAccumulatedPower() * FDXSS * DUST));
         //煤
-        map.put("coal",format2.format(jpStation.getAccumulatedPower()*FDXSS*COAL));
+        map.put("coal", format2.format(jpStation.getAccumulatedPower() * FDXSS * COAL));
         itemList.add(map);
         result.setCurrent(1);
         result.setTotal(1);
@@ -497,138 +505,134 @@ public class JpStationController extends BaseController {
     }
 
 
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "电站列表统计",   notes = "电站列表统计")
+    @ApiOperation(httpMethod = "GET", value = "电站列表统计", notes = "电站列表统计")
     @GetMapping(value = "/getjpStationConservation")
     @UserLimits
-    public ResponseModel< Page<Map<String,Object>>> getjpStationConservation(JpStationDto reviewDto) {
-        JpStationDto jpStation= jpStationMapper.getCountJpStationdata(reviewDto);
+    public ResponseModel<Page<Map<String, Object>>> getjpStationConservation(JpStationDto reviewDto) {
+        JpStationDto jpStation = jpStationMapper.getCountJpStationdata(reviewDto);
 
 
-        List<Map<String,Object>> date=new ArrayList<>();
+        List<Map<String, Object>> date = new ArrayList<>();
 
 
-        Map<String,Object> map=new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         DecimalFormat format2 = new DecimalFormat("0.000");
         //炭
-        map.put("name1","实时功率(kW)");
-        map.put("name2","组件总容量(MWp)");
+        map.put("name1", "实时功率(kW)");
+        map.put("name2", "组件总容量(MWp)");
 
-        map.put("value1",format2.format(jpStation.getRealTimePower()));
+        map.put("value1", format2.format(jpStation.getRealTimePower()));
         //硫
-        map.put("value2",format2.format(jpStation.getCapacity()));
+        map.put("value2", format2.format(jpStation.getCapacity()));
 
 
-        Map<String,Object> map2=new HashMap<>();
-        map2.put("name1","当日电量(MWh)");
-        map2.put("name2","当日收益(元)");
+        Map<String, Object> map2 = new HashMap<>();
+        map2.put("name1", "当日电量(MWh)");
+        map2.put("name2", "当日收益(元)");
         //炭
-        map2.put("value1",format2.format(jpStation.getDayGenerate()));
+        map2.put("value1", format2.format(jpStation.getDayGenerate()));
         //硫
-        map2.put("value2",format2.format(jpStation.getDayIncome()));
-        Map<String,Object> map3=new HashMap<>();
-        map3.put("name1","当月电量(MWh)");
-        map3.put("name2","当月收益(万元)");
+        map2.put("value2", format2.format(jpStation.getDayIncome()));
+        Map<String, Object> map3 = new HashMap<>();
+        map3.put("name1", "当月电量(MWh)");
+        map3.put("name2", "当月收益(万元)");
         //炭
-        map3.put("value1",format2.format(jpStation.getMonthGenerate()));
+        map3.put("value1", format2.format(jpStation.getMonthGenerate()));
         //硫
-        map3.put("value2",format2.format(jpStation.getMonthIncome()));
-        Map<String,Object> map4=new HashMap<>();
-        map4.put("name1","累计电量(MWh)");
-        map4.put("name2","累计收益(万元)");
+        map3.put("value2", format2.format(jpStation.getMonthIncome()));
+        Map<String, Object> map4 = new HashMap<>();
+        map4.put("name1", "累计电量(MWh)");
+        map4.put("name2", "累计收益(万元)");
         //炭
-        map4.put("value1",format2.format(jpStation.getAccumulatedPower()));
+        map4.put("value1", format2.format(jpStation.getAccumulatedPower()));
         //硫
-        map4.put("value2",format2.format(jpStation.getCumulativeIncome()));
+        map4.put("value2", format2.format(jpStation.getCumulativeIncome()));
 
         date.add(map);
         date.add(map2);
         date.add(map3);
         date.add(map4);
-        Page<Map<String,Object>> page = new Page<>(1, 4);
+        Page<Map<String, Object>> page = new Page<>(1, 4);
         page.setRecords(date);
         return ResponseHelper.buildResponse(page);
     }
 
 
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "电站统计",   notes = "电站统计")
+    @ApiOperation(httpMethod = "GET", value = "电站统计", notes = "电站统计")
     @GetMapping(value = "/getcountJpStationNum")
-    public ResponseModel<List<Map<String,Object>>> getcountJpStationNum(JpStationDto reviewDto) {
-        List<Map<String,Object>> itemList =new ArrayList<>();
-        Map<String,Object>  collector =new HashMap<>();
-        collector.put("在线",0);
-        collector.put("离线",0);
-        collector.put("报警",0);
-        List<Map<String,Object>> list= jpStationServiceImpl.getcountState(reviewDto);
-        if(list!=null&&!list.isEmpty()){
+    public ResponseModel<List<Map<String, Object>>> getcountJpStationNum(JpStationDto reviewDto) {
+        List<Map<String, Object>> itemList = new ArrayList<>();
+        Map<String, Object> collector = new HashMap<>();
+        collector.put("在线", 0);
+        collector.put("离线", 0);
+        collector.put("报警", 0);
+        List<Map<String, Object>> list = jpStationServiceImpl.getcountState(reviewDto);
+        if (list != null && !list.isEmpty()) {
             for (Map<String, Object> map : list) {
-                if(ZX.equals(map.get("state").toString())){
+                if (ZX.equals(map.get("state").toString())) {
 
-                    collector.put("正常",Integer.valueOf(map.get("num").toString()));
-                }else if(LX.equals(map.get("state").toString())){
-                    collector.put("离线",Integer.valueOf(map.get("num").toString()));
-                }else if(BJ.equals(map.get("state").toString())){
-                    collector.put("报警",Integer.valueOf(map.get("num").toString()));
+                    collector.put("正常", Integer.valueOf(map.get("num").toString()));
+                } else if (LX.equals(map.get("state").toString())) {
+                    collector.put("离线", Integer.valueOf(map.get("num").toString()));
+                } else if (BJ.equals(map.get("state").toString())) {
+                    collector.put("报警", Integer.valueOf(map.get("num").toString()));
                 }
             }
         }
 
-        Map<String,Object> result  =  new HashMap<>();
-        result.put("name","正常");
-        result.put("value",collector.get("正常"));
+        Map<String, Object> result = new HashMap<>();
+        result.put("name", "正常");
+        result.put("value", collector.get("正常"));
         itemList.add(result);
 
-        Map<String,Object> result1  =  new HashMap<>();
-        result1.put("name","离线");
-        result1.put("value",collector.get("离线"));
+        Map<String, Object> result1 = new HashMap<>();
+        result1.put("name", "离线");
+        result1.put("value", collector.get("离线"));
         itemList.add(result1);
 
-        Map<String,Object> result2  =  new HashMap<>();
-        result2.put("name","报警");
-        result2.put("value",collector.get("报警"));
+        Map<String, Object> result2 = new HashMap<>();
+        result2.put("name", "报警");
+        result2.put("value", collector.get("报警"));
         itemList.add(result2);
 
         return ResponseHelper.buildResponse(itemList);
     }
 
 
-
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "电站统计",   notes = "电站统计")
+    @ApiOperation(httpMethod = "GET", value = "电站统计", notes = "电站统计")
     @GetMapping(value = "/getcountJpStation")
-    public ResponseModel<Page< Map<String,Object>>> getcountJpStation(JpStationDto reviewDto) {
-        List<Map<String,Object>> itemList =new ArrayList<>();
-        Map<String,Object>  collector =new HashMap<>();
-        collector.put("zx",0);
-        collector.put("bj",0);
-        collector.put("lx",0);
-        List<Map<String,Object>> list= jpStationServiceImpl.getcountState(reviewDto);
-        if(list!=null&&!list.isEmpty()){
+    public ResponseModel<Page<Map<String, Object>>> getcountJpStation(JpStationDto reviewDto) {
+        List<Map<String, Object>> itemList = new ArrayList<>();
+        Map<String, Object> collector = new HashMap<>();
+        collector.put("zx", 0);
+        collector.put("bj", 0);
+        collector.put("lx", 0);
+        List<Map<String, Object>> list = jpStationServiceImpl.getcountState(reviewDto);
+        if (list != null && !list.isEmpty()) {
             for (Map<String, Object> map : list) {
-                if(ZX.equals(map.get("state").toString())){
-                    collector.put("zx",Integer.valueOf(map.get("num").toString()));
-                }else if(LX.equals(map.get("state").toString())){
-                    collector.put("lx",Integer.valueOf(map.get("num").toString()));
-                }else if(BJ.equals(map.get("state").toString())){
-                    collector.put("bj",Integer.valueOf(map.get("num").toString()));
+                if (ZX.equals(map.get("state").toString())) {
+                    collector.put("zx", Integer.valueOf(map.get("num").toString()));
+                } else if (LX.equals(map.get("state").toString())) {
+                    collector.put("lx", Integer.valueOf(map.get("num").toString()));
+                } else if (BJ.equals(map.get("state").toString())) {
+                    collector.put("bj", Integer.valueOf(map.get("num").toString()));
                 }
             }
         }
-        Map<String,Object> js= jpStationServiceImpl.getcountStatejs(reviewDto);
-        Map<String,Object> tc= jpStationServiceImpl.getcountStatetc(reviewDto);
-        Map<String,Object> jr= jpStationServiceImpl.getcountStatejr(reviewDto);
-        Map<String,Object> zs= jpStationServiceImpl.getcount(reviewDto);
-
-        collector.put("js",js.get("num"));
-        collector.put("tc",tc.get("num"));
-        collector.put("jr",jr.get("num"));
-        collector.put("zs",zs.get("num"));
+        Map<String, Object> js = jpStationServiceImpl.getcountStatejs(reviewDto);
+        Map<String, Object> tc = jpStationServiceImpl.getcountStatetc(reviewDto);
+        Map<String, Object> jr = jpStationServiceImpl.getcountStatejr(reviewDto);
+        Map<String, Object> zs = jpStationServiceImpl.getcount(reviewDto);
+
+        collector.put("js", js.get("num"));
+        collector.put("tc", tc.get("num"));
+        collector.put("jr", jr.get("num"));
+        collector.put("zs", zs.get("num"));
         itemList.add(collector);
-        Page< Map<String,Object>> result =new Page<>();
+        Page<Map<String, Object>> result = new Page<>();
         result.setCurrent(1);
         result.setTotal(1);
         result.setRecords(itemList);
@@ -638,23 +642,23 @@ public class JpStationController extends BaseController {
     //日满发小时排行
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "日满发小时排行",   notes = "日满发小时排行")
+    @ApiOperation(httpMethod = "GET", value = "日满发小时排行", notes = "日满发小时排行")
     @GetMapping(value = "/getDayGenerateph")
-    public ResponseModel< Page< Map<String,Object>>> getDayGenerateph(JpStationDto reviewDto,String type,String dateTime ) {
+    public ResponseModel<Page<Map<String, Object>>> getDayGenerateph(JpStationDto reviewDto, String type, String dateTime) {
 
-        List<JpStation> list=  jpStationServiceImpl.getJpStation(reviewDto);
-        List<Map<String,Object>> li=new ArrayList<>();
-        List<DayGenerate> date= dayGenerateServiceImpl.getDayGenerateph(list,type,dateTime);
+        List<JpStation> list = jpStationServiceImpl.getJpStation(reviewDto);
+        List<Map<String, Object>> li = new ArrayList<>();
+        List<DayGenerate> date = dayGenerateServiceImpl.getDayGenerateph(list, type, dateTime);
         DecimalFormat format2 = new DecimalFormat("0.00");
-        if(date!=null&&!list.isEmpty()){
+        if (date != null && !list.isEmpty()) {
             for (DayGenerate dayGenerate : date) {
-                Map<String,Object> map =new HashMap<>();
+                Map<String, Object> map = new HashMap<>();
                 for (JpStation jpStation : list) {
-                    if(dayGenerate.getThirdStationId().equals(jpStation.getThirdStationId())){
-                        map.put("id",jpStation.getSequenceNbr());
-                        map.put("name",jpStation.getName());
-                        map.put("address",jpStation.getAddress());
-                        map.put("fullhour",format2.format(dayGenerate.getFullhour()));
+                    if (dayGenerate.getThirdStationId().equals(jpStation.getThirdStationId())) {
+                        map.put("id", jpStation.getSequenceNbr());
+                        map.put("name", jpStation.getName());
+                        map.put("address", jpStation.getAddress());
+                        map.put("fullhour", format2.format(dayGenerate.getFullhour()));
                         li.add(map);
                         break;
                     }
@@ -662,7 +666,7 @@ public class JpStationController extends BaseController {
 
             }
         }
-        Page< Map<String,Object>> result =new Page<>();
+        Page<Map<String, Object>> result = new Page<>();
         result.setCurrent(1);
         result.setTotal(10);
         result.setRecords(li);
@@ -670,66 +674,64 @@ public class JpStationController extends BaseController {
     }
 
 
-
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "发电量曲线",   notes = "发电量曲线")
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "发电量曲线", notes = "发电量曲线")
     @GetMapping(value = "/getGenerateqx")
-    public ResponseModel< Map<String, List<Object>>> getGenerateqx(JpStationDto reviewDto,String date, String type) {
+    public ResponseModel<Map<String, List<Object>>> getGenerateqx(JpStationDto reviewDto, String date, String type) {
 
-        Map<String, List<Object>>  map= jpStationServiceImpl.getGenerateqx( date,  type,reviewDto);
+        Map<String, List<Object>> map = jpStationServiceImpl.getGenerateqx(date, type, reviewDto);
 
 
         return ResponseHelper.buildResponse(map);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "工率曲线",   notes = "电站监控电量收益")
+    @ApiOperation(httpMethod = "GET", value = "工率曲线", notes = "电站监控电量收益")
     @GetMapping(value = "/getPowerqxnew")
-    public ResponseModel< Map<String, List<Object>>> getPowerqxnew(JpStationDto reviewDto,String date) {
+    public ResponseModel<Map<String, List<Object>>> getPowerqxnew(JpStationDto reviewDto, String date) {
 
-        Map<String, List<Object>>  map= jpStationServiceImpl.getPowerqxnew( date,reviewDto);
+        Map<String, List<Object>> map = jpStationServiceImpl.getPowerqxnew(date, reviewDto);
 
         return ResponseHelper.buildResponse(map);
     }
 
 
-
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/queryPagenew")
-    @ApiOperation(httpMethod = "GET",value = "场站列表",  notes = "场站列表")
+    @ApiOperation(httpMethod = "GET", value = "场站列表", notes = "场站列表")
     public ResponseModel<Page<JpStationDto>> queryPagenew(@RequestParam(value = "current") int current, @RequestParam
             (value = "size") int size, JpStationDto reviewDto) {
-        Page<JpStationDto> page=jpStationServiceImpl.queryForJpStationPagenew(current,size,reviewDto);
+        Page<JpStationDto> page = jpStationServiceImpl.queryForJpStationPagenew(current, size, reviewDto);
         return ResponseHelper.buildResponse(page);
     }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping (value = "/queryReport")
-    @ApiOperation(httpMethod = "POST",value = "场站报表",  notes = "场站报表")
+    @PostMapping(value = "/queryReport")
+    @ApiOperation(httpMethod = "POST", value = "场站报表", notes = "场站报表")
     public ResponseModel<Page<JpStationDto>> queryReport(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size,@RequestBody JpStationDto reviewDto,@RequestParam(value = "type") String type) {
+            (value = "size") int size, @RequestBody JpStationDto reviewDto, @RequestParam(value = "type") String type) {
 
-        Page<JpStationDto> page=jpStationServiceImpl.queryReport(current,size,reviewDto,type);
+        Page<JpStationDto> page = jpStationServiceImpl.queryReport(current, size, reviewDto, type);
 
         return ResponseHelper.buildResponse(page);
     }
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "登录人场站",   notes = "登录人场站")
+    @ApiOperation(httpMethod = "GET", value = "登录人场站", notes = "登录人场站")
     @GetMapping(value = "/getuserJpStation")
-    public ResponseModel< List<JpStation>> getuserJpStation(JpStationDto reviewDto) {
+    public ResponseModel<List<JpStation>> getuserJpStation(JpStationDto reviewDto) {
         List<JpStation> list = jpStationServiceImpl.getJpStation(reviewDto);
         return ResponseHelper.buildResponse(list);
     }
 
 
-        @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "工率曲线",   notes = "电站监控电量收益")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "工率曲线", notes = "电站监控电量收益")
     @GetMapping(value = "/test")
     public Object getPowerqx(JpStationDto reviewDto) {
 
-            List<JpStation> list=  jpStationServiceImpl.getJpStation(new JpStationDto());
+        List<JpStation> list = jpStationServiceImpl.getJpStation(new JpStationDto());
         return list;
     }
 
@@ -737,11 +739,11 @@ public class JpStationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/jpstationReportExport", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "电站报表导出", notes = "电站报表导出")
-    public void jpstationReportExport( HttpServletResponse response,@RequestBody JpStationDto reviewDto,@RequestParam(value = "type")String type) {
+    public void jpstationReportExport(HttpServletResponse response, @RequestBody JpStationDto reviewDto, @RequestParam(value = "type") String type) {
 //        List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
 //        List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
 
-        List<JpStationDto> jpStationDtos = jpStationServiceImpl.selectReportDate(reviewDto, type,response);
+        List<JpStationDto> jpStationDtos = jpStationServiceImpl.selectReportDate(reviewDto, type, response);
 //        try {
 //            setResponseHeadForDowload(response,"电站报表.xls");
 //            EasyExcel.write(response.getOutputStream()).head(JpStationDto.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表")
@@ -753,6 +755,4 @@ public class JpStationController extends BaseController {
     }
 
 
-
-
 }

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+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.entity.Maintenance;
+import com.yeejoin.amos.boot.module.hygf.api.entity.MaintenanceLog;
+import com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.MaintenanceMapper;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import net.sf.json.JSONObject;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.MaintenanceServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 运维人员
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@RestController
+@Api(tags = "运维人员Api")
+@RequestMapping(value = "/maintenance")
+public class MaintenanceController extends BaseController {
+
+    @Autowired
+    MaintenanceServiceImpl maintenanceServiceImpl;
+    @Autowired
+    JpStationMapper jpStationMapper;
+
+    @Autowired
+    MaintenanceMapper maintenanceMapper;
+    /**
+     * 新增运维人员
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增运维人员", notes = "新增运维人员")
+    public ResponseModel<Maintenance> save(@RequestBody Maintenance model) {
+        model = maintenanceServiceImpl.saveMaintenance(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新运维人员", notes = "根据sequenceNbr更新运维人员")
+    public ResponseModel<MaintenanceDto> updateBySequenceNbrMaintenance(@RequestBody MaintenanceDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除运维人员", notes = "根据sequenceNbr删除运维人员")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr  主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个运维人员",  notes = "根据sequenceNbr查询单个运维人员")
+    public ResponseModel<Map<String,Object> > selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.selectOneById(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET",value = "运维人员分页查询",  notes = "运维人员分页查询")
+    public ResponseModel<Page<MaintenanceDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+            (value = "size") int size,
+                                                         @RequestParam(required = false) String name,
+                                                         @RequestParam(required = false)String maintenanceTypeCode,
+                                                         @RequestParam(required = false)String maintenanceType,
+                                                         @RequestParam(required = false) String lockStatus,
+                                                         @RequestParam(required = false)String reviewStatus,
+                                                         @RequestParam(required = false)Long regionalCompaniesSeq,
+                                                         @RequestParam(required = false)Long dealerId,
+                                                         @RequestParam(required = false)String maintenanceAreaAddress
+    ) {
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.queryForMaintenancePage( current, size, name, maintenanceTypeCode,lockStatus,reviewStatus,regionalCompaniesSeq,dealerId,maintenanceType,maintenanceAreaAddress));
+    }
+
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping (value = "examine/{sequenceNbr}")
+    @ApiOperation(httpMethod = "post",value = "审核单个运维人员",  notes = "审核单个运维人员")
+    public ResponseModel<Maintenance> examine(@PathVariable Long sequenceNbr,@RequestBody MaintenanceLog maintenanceLog) {
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.examine(sequenceNbr,maintenanceLog));
+    }
+
+
+
+
+
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "运维人员列表全部数据查询",   notes = "运维人员列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<MaintenanceDto>> selectForList(
+            @RequestParam(required = false) String name, //运维人员类型
+            @RequestParam(required = false)String maintenanceType //运维人员类型code
+
+    ) {
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.queryList(
+                 name, //运维人员类型
+                maintenanceType //运维人员类型code
+
+        ));
+    }
+
+
+
+    //查询当前登录人权限经销商
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET",value = "查询当前登录人权限经销商",   notes = "查询当前登录人权限经销商")
+    @GetMapping(value = "/getDealer")
+    public ResponseModel<List<Map<String,String>>> getDealer(String regionalCompaniesCode ) {
+        List<DropDown>  list=  jpStationMapper.getDealerNew(regionalCompaniesCode);
+        List<Map<String,String>> result = new ArrayList<>();
+        list.forEach(dropDown -> {
+            Map<String,String> item = new HashMap<>();
+            item.put("text",dropDown.getName());
+            item.put("value",dropDown.getOrgCode());
+            result.add(item);
+        });
+        return ResponseHelper.buildResponse(result);
+    }
+
+
+    //查询当前登录人权限经销商
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "经销商人员加入黑名单/撤销黑名单",   notes = "经销商人员加入黑名单/撤销黑名单")
+    @GetMapping(value = "/updateUser")
+    public ResponseModel<Object> updateUser(Long sequenceNbr ,String type) {
+        maintenanceServiceImpl.updateUser( sequenceNbr , type);
+        return ResponseHelper.buildResponse(null);
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "签订安全协议",   notes = "签订安全协议")
+    @GetMapping(value = "/updateAgreement")
+    public ResponseModel<Object> updateTrainingAgreement(String userId) {
+        maintenanceServiceImpl.updateTrainingAgreement(userId);
+        return ResponseHelper.buildResponse(null);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "验证安全签订安全协议是否签订",   notes = "验证安全签订安全协议是否签订")
+    @GetMapping(value = "/getTrainingAgreement")
+    public ResponseModel<String> getTrainingAgreement(String userId) {
+        MaintenanceDto maintenanceDto=maintenanceMapper.getTrainingAgreement(userId);
+        if(maintenanceDto.getIsSignAnAgreement()!=null&&maintenanceDto.getIsSignAnAgreement()==1){
+            return ResponseHelper.buildResponse("true");
+        }
+        return ResponseHelper.buildResponse("false");
+    }
+}

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.MaintenanceFileServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceFileDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 运维人员文件
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@RestController
+@Api(tags = "运维人员文件Api")
+@RequestMapping(value = "/maintenance-file")
+public class MaintenanceFileController extends BaseController {
+
+    @Autowired
+    MaintenanceFileServiceImpl maintenanceFileServiceImpl;
+
+    /**
+     * 新增运维人员文件
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增运维人员文件", notes = "新增运维人员文件")
+	public ResponseModel<MaintenanceFileDto> save(@RequestBody MaintenanceFileDto model) {
+	    model = maintenanceFileServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新运维人员文件", notes = "根据sequenceNbr更新运维人员文件")
+	public ResponseModel<MaintenanceFileDto> updateBySequenceNbrMaintenanceFile(@RequestBody MaintenanceFileDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(maintenanceFileServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除运维人员文件", notes = "根据sequenceNbr删除运维人员文件")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(maintenanceFileServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个运维人员文件",  notes = "根据sequenceNbr查询单个运维人员文件")
+	public ResponseModel<MaintenanceFileDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(maintenanceFileServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "运维人员文件分页查询",  notes = "运维人员文件分页查询")
+	public ResponseModel<Page<MaintenanceFileDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<MaintenanceFileDto> page = new Page<MaintenanceFileDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(maintenanceFileServiceImpl.queryForMaintenanceFilePage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "运维人员文件列表全部数据查询",   notes = "运维人员文件列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<MaintenanceFileDto>> selectForList() {
+	    return ResponseHelper.buildResponse(maintenanceFileServiceImpl.queryForMaintenanceFileList());
+	}
+}

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.MaintenanceLogServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceLogDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 运维人员操作记录
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@RestController
+@Api(tags = "运维人员操作记录Api")
+@RequestMapping(value = "/maintenance-log")
+public class MaintenanceLogController extends BaseController {
+
+    @Autowired
+    MaintenanceLogServiceImpl maintenanceLogServiceImpl;
+
+    /**
+     * 新增运维人员操作记录
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增运维人员操作记录", notes = "新增运维人员操作记录")
+	public ResponseModel<MaintenanceLogDto> save(@RequestBody MaintenanceLogDto model) {
+	    model = maintenanceLogServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新运维人员操作记录", notes = "根据sequenceNbr更新运维人员操作记录")
+	public ResponseModel<MaintenanceLogDto> updateBySequenceNbrMaintenanceLog(@RequestBody MaintenanceLogDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(maintenanceLogServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除运维人员操作记录", notes = "根据sequenceNbr删除运维人员操作记录")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(maintenanceLogServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个运维人员操作记录",  notes = "根据sequenceNbr查询单个运维人员操作记录")
+	public ResponseModel<MaintenanceLogDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(maintenanceLogServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "运维人员操作记录分页查询",  notes = "运维人员操作记录分页查询")
+	public ResponseModel<Page<MaintenanceLogDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<MaintenanceLogDto> page = new Page<MaintenanceLogDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(maintenanceLogServiceImpl.queryForMaintenanceLogPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "运维人员操作记录列表全部数据查询",   notes = "运维人员操作记录列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<MaintenanceLogDto>> selectForList() {
+	    return ResponseHelper.buildResponse(maintenanceLogServiceImpl.queryForMaintenanceLogList());
+	}
+}

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.MaintenanceServiceImpl;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.MaintenanceTrainingServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceTrainingDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/maintenance-training")
+public class MaintenanceTrainingController extends BaseController {
+
+    @Autowired
+    MaintenanceTrainingServiceImpl maintenanceTrainingServiceImpl;
+    @Autowired
+	MaintenanceServiceImpl maintenanceService;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<MaintenanceTrainingDto> save(@RequestBody MaintenanceTrainingDto model) {
+
+		maintenanceTrainingServiceImpl.selectTrainingStatus(model,model.getUserId());
+
+
+		return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<MaintenanceTrainingDto> updateBySequenceNbrMaintenanceTraining(@RequestBody MaintenanceTrainingDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(maintenanceTrainingServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(maintenanceTrainingServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<MaintenanceTrainingDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(maintenanceTrainingServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<MaintenanceTrainingDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<MaintenanceTrainingDto> page = new Page<MaintenanceTrainingDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(maintenanceTrainingServiceImpl.queryForMaintenanceTrainingPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<MaintenanceTrainingDto>> selectForList() {
+	    return ResponseHelper.buildResponse(maintenanceTrainingServiceImpl.queryForMaintenanceTrainingList());
+	}
+}

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

@@ -216,6 +216,7 @@ public class PreparationMoneyController extends BaseController {
 
        Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
         pagenew.setRecords(list);
+        pagenew.setTotal(list.size());
         return ResponseHelper.buildResponse(pagenew);
     }
 

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

@@ -112,7 +112,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
 	 * @param sequenceNbr 主键
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "time/{createdTime}")
 	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表", notes = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表")
 	public ResponseModel<TdHygfJpInverterWarnDto> selectCreatedTime(@PathVariable Long createdTime) {
@@ -126,7 +126,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
 	 * @param current 每页大小
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表分页查询", notes = "户用光伏监盘逆变器报警表分页查询")
 	public ResponseModel<Page<TdHygfJpInverterWarnDto>> queryForPage(@RequestParam(value = "current") int current,
@@ -144,8 +144,6 @@ public class TdHygfJpInverterWarnController extends BaseController {
 
         }
 
-
-
 		if (!pPersonStation.isEmpty()) {
 			Page<TdHygfJpInverterWarnDto> page = new Page<TdHygfJpInverterWarnDto>();
 			page.setCurrent(current);
@@ -234,6 +232,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
 	@GetMapping(value = "/selectWarnList")
 	@UserLimits
 	public ResponseModel<Page<TdHygfJpInverterWarnDto>> selectWarnList(@RequestParam(required = false) String state,
+																@RequestParam(required = false) String handlerStatus,
 																@RequestParam(required = false) String level,
 																@RequestParam(required = false) String stationName,
 																@RequestParam(required = false) String minvalue,
@@ -284,7 +283,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
 		if (StringUtils.isNotEmpty(content)){
 			content = '%'+content+'%';
 		}
-		List<TdHygfJpInverterWarnDto> maps = tdHygfJpInverterWarnServiceImpl.selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,current,size);
+		List<TdHygfJpInverterWarnDto> maps = tdHygfJpInverterWarnServiceImpl.selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,current,size,handlerStatus);
 		for (TdHygfJpInverterWarnDto map : maps) {
 			if (nameMaps.containsKey(map.getThirdStationId())){
 				map.setStationName(nameMaps.get(map.getThirdStationId()));
@@ -293,7 +292,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
 			map.setTimeLongFormat(te);
 		}
 
-		result.setTotal(tdHygfJpInverterWarnServiceImpl.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content));
+		result.setTotal(tdHygfJpInverterWarnServiceImpl.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,handlerStatus));
 		result.setRecords(maps);
 		return ResponseHelper.buildResponse(result);
 	}

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.TrainingServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.TrainingDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 培训信息表
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@RestController
+@Api(tags = "培训信息表Api")
+@RequestMapping(value = "/training")
+public class TrainingController extends BaseController {
+
+    @Autowired
+    TrainingServiceImpl trainingServiceImpl;
+
+    /**
+     * 新增培训信息表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增培训信息表", notes = "新增培训信息表")
+	public ResponseModel<TrainingDto> save(@RequestBody TrainingDto model) {
+	    model = trainingServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新培训信息表", notes = "根据sequenceNbr更新培训信息表")
+	public ResponseModel<TrainingDto> updateBySequenceNbrTraining(@RequestBody TrainingDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(trainingServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除培训信息表", notes = "根据sequenceNbr删除培训信息表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(trainingServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个培训信息表",  notes = "根据sequenceNbr查询单个培训信息表")
+	public ResponseModel<TrainingDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(trainingServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "培训信息表列表全部数据查询",   notes = "培训信息表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<TrainingDto>> selectForList() {
+	    return ResponseHelper.buildResponse(trainingServiceImpl.queryForTrainingList());
+	}
+
+	/**
+	 * 列表分页查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "培训信息表列表全部数据查询",   notes = "培训信息表列表全部数据查询")
+	@GetMapping(value = "/page")
+	public ResponseModel<Page<TrainingDto>> currentStudyStatusList(Integer current,
+                                                                   Integer size,
+                                                                   @RequestParam(required = false) String status,
+                                                                   @RequestParam(required = false)  String name
+                                                                   ) {
+	    return ResponseHelper.buildResponse(trainingServiceImpl.currentStudyStatusList(current,size,   status,
+                 name));
+	}
+
+
+}

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

@@ -159,6 +159,7 @@ public class WorkOrderController extends BaseController {
 
         Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
         pagenew.setRecords(list);
+        pagenew.setTotal(list.size());
         return ResponseHelper.buildResponse(pagenew);
     }
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/emqx/MaintenanceResultHandlerMessage.java

+package com.yeejoin.amos.boot.module.hygf.biz.emqx;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HYGFMaintenanceTickets;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
+import com.yeejoin.amos.boot.module.hygf.api.entity.Maintenance;
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterWarn;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HYGFMaintenanceTicketsMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.MaintenanceMapper;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarnMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.component.emq.EmqxListener;
+
+import javax.annotation.PostConstruct;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Slf4j
+public class MaintenanceResultHandlerMessage extends EmqxListener {
+    public static final String WARNING_RESULT_MESSAGE = "+/warning/result";
+    public static final String HYGF_MAINTENANCE_RESULT_MESSAGE = "hygfmaintenance";
+
+    @Autowired
+    EmqKeeper emqKeeper;
+    //工单mapper
+    @Autowired
+    HYGFMaintenanceTicketsMapper hygfMaintenanceTicketsMapper;
+    @Autowired
+    JpStationMapper jpStationMapper;
+    @Autowired
+    TdHygfJpInverterWarnMapper tdHygfJpInverterWarnMapper;
+    @Autowired
+    MaintenanceMapper maintenanceMapper;
+
+    @PostConstruct
+    void init() throws Exception {
+        emqKeeper.subscript(WARNING_RESULT_MESSAGE, 2, this);
+    }
+
+    @Override
+    public void processMessage(String topic, MqttMessage message) throws Exception {
+        if (topic.contains(HYGF_MAINTENANCE_RESULT_MESSAGE)) {
+            log.info("收到户用光伏工单推送-消息{}", new String(message.getPayload()));
+            JSONObject jsonObject = JSON.parseObject(new String(message.getPayload()));
+            JxiopUpdateMaintenance(jsonObject);
+        }
+    }
+
+    @Async("async")
+    public void JxiopUpdateMaintenance(JSONObject jsonObject) {
+        if (jsonObject.containsKey("rawData")) {
+            JSONObject rawData = jsonObject.getJSONObject("rawData");
+            JSONObject bizInfo = rawData.getJSONObject("bizInfo");
+            JSONArray jsonArray = bizInfo.getJSONArray("dynamicDetails");
+            Map<String, Object> specialMap = new HashMap<>();
+            if (jsonArray.size() > 0) {
+                jsonObject = (JSONObject) jsonArray.get(0);
+                specialMap = jsonObject.get("specialMap") == null ? null : jsonObject.getJSONObject("specialMap").toJavaObject(Map.class);
+            }
+            HYGFMaintenanceTickets hygfMaintenanceTickets = new HYGFMaintenanceTickets();
+            String stationid = specialMap.get("stationId") == null ? null : specialMap.get("stationId").toString();
+            Long warningId = specialMap.containsKey("warningId") ? Long.valueOf(specialMap.get("warningId").toString()) : 0L;
+            if(warningId>0){
+               List<HYGFMaintenanceTickets> hygfMaintenanceTicketsList = hygfMaintenanceTicketsMapper.selectList(new QueryWrapper<HYGFMaintenanceTickets>().eq("warning_id", warningId));
+                if (hygfMaintenanceTicketsList.size()>0) {
+                    return;
+                }
+            }
+            String sncode = specialMap.containsKey("inverterSncode")?specialMap.get("inverterSncode").toString():"";
+            String mantainancePersonId = specialMap.get("maintenancePersonId").toString();
+            JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().eq("third_station_id", stationid));
+            if (ObjectUtil.isEmpty(jpStation)) {
+                jpStation = jpStationMapper.selectById(stationid);
+            }
+            TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(warningId, sncode, stationid);
+            hygfMaintenanceTickets.setHandlerStatus("未处理");
+            MaintenanceDto maintenance = maintenanceMapper.selectOneById(Long.valueOf(mantainancePersonId));
+            hygfMaintenanceTickets.setStationId(stationid);
+            hygfMaintenanceTickets.setWarningId(warningId);
+            hygfMaintenanceTickets.setMaintenancePersonId(mantainancePersonId);
+            if (ObjectUtil.isNotEmpty(maintenance)) {
+                hygfMaintenanceTickets.setMaintenancePersonName(maintenance.getName());
+                hygfMaintenanceTickets.setMaintenancePersonPhone(maintenance.getTelephone());
+            }
+            if (ObjectUtil.isNotEmpty(jpStation)) {
+                //场站名称
+                hygfMaintenanceTickets.setStationName(jpStation.getName());
+                //区域公司编码
+                hygfMaintenanceTickets.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+                //经销商orgCode
+                hygfMaintenanceTickets.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+                //地址
+                hygfMaintenanceTickets.setStationAddress(jpStation.getAddress());
+                //经度
+                hygfMaintenanceTickets.setStationLongitude(jpStation.getLongitude());
+                //纬度
+                hygfMaintenanceTickets.setStationLatitude(jpStation.getLatitude());
+                //电站联系人电话
+                hygfMaintenanceTickets.setStationContactPhone(jpStation.getUserPhone());
+                // 电站联系人
+                hygfMaintenanceTickets.setStationContact(jpStation.getStationContact());
+                //业主姓名
+                hygfMaintenanceTickets.setOwnerName(jpStation.getUserName());
+                if (ObjectUtil.isEmpty(hygfMaintenanceTickets.getStationContact())) {
+                    hygfMaintenanceTickets.setStationContact(jpStation.getUserName());
+                }
+            }
+            hygfMaintenanceTickets.setInverterSn(sncode);
+            if(specialMap.containsKey("warningLevel")){
+                hygfMaintenanceTickets.setWarningLevel(specialMap.get("warningLevel").toString());
+            }
+            if(specialMap.containsKey("warningContent")){
+                hygfMaintenanceTickets.setWarningContent(specialMap.get("warningContent").toString());
+
+            }
+            if(ObjectUtil.isNotNull(specialMap.get("taskStartTime"))){
+                hygfMaintenanceTickets.setTaskStartTime(new Date( Long.valueOf(specialMap.get("taskStartTime").toString())));
+            }
+            if(ObjectUtil.isNotNull(specialMap.get("taskEndTime"))){
+                hygfMaintenanceTickets.setTaskEndTime(new Date( Long.valueOf(specialMap.get("taskEndTime").toString())));
+            }
+
+            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
+                hygfMaintenanceTickets.setWarningLevel(tdHygfJpInverterWarn.getLevel());
+                hygfMaintenanceTickets.setWarningContent(tdHygfJpInverterWarn.getContent());
+                hygfMaintenanceTickets.setWarningStatus(tdHygfJpInverterWarn.getState());
+                //告警等级
+                hygfMaintenanceTickets.setWarningStartTime(new Date(tdHygfJpInverterWarn.getStartTime()));
+                hygfMaintenanceTickets.setTicketType("手动");
+            }
+
+
+            hygfMaintenanceTicketsMapper.insert(hygfMaintenanceTickets);
+            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
+                tdHygfJpInverterWarn.setHandlerStatus("处理中");
+                tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
+            }
+            log.info("创建运维工单成功{}", JSON.toJSONString(hygfMaintenanceTickets));
+        }
+    }
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/WorkflowFeignClient.java

@@ -74,7 +74,12 @@ public interface WorkflowFeignClient {
     @RequestMapping(value = "/v2/task/start/batch", method = RequestMethod.POST)
     FeignClientResult<List<ProcessTaskDTO>> startProcess(@RequestBody StartProcessDto startProcessDto);
 
-
+    @RequestMapping(value = "/v2/task/start/batch", method = RequestMethod.POST)
+    FeignClientResult<List<ProcessTaskDTO>> startProcessnew(
+            @RequestHeader(name="appKey",required = true) String appKey,
+            @RequestHeader(name="product",required = true) String product,
+            @RequestHeader(name="token",required = true) String token,
+            @RequestBody StartProcessDto startProcessDto);
 
     /**
      * 执行流程

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

@@ -96,6 +96,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
        }else{
            // 调用工作流执行第一个节点
            ProcessDto processDto = new ProcessDto();
+           processDto.setProcessDefinitionKey("hygf_bwys");
            processDto.setBusinessKey(String.valueOf(basicGridAcceptance.getSequenceNbr()));
            StartProcessDto startProcessDto = new StartProcessDto();
            List<ProcessDto> process=new ArrayList<>();

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.unit.DataUnit;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.module.hygf.api.dto.*;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HYGFMaintenanceTickets;
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterWarn;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HYGFMaintenanceTicketsMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IHYGFMaintenanceTicketsService;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarnMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+@Slf4j
+@Service
+public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenanceTicketsDto, HYGFMaintenanceTickets, HYGFMaintenanceTicketsMapper> implements IHYGFMaintenanceTicketsService {
+    public static final String WARNING_RESULT_MESSAGE = "hygfmaintenance/warning/result";
+    @Autowired
+    EmqKeeper emqKeeper;
+    @Autowired
+    TdHygfJpInverterWarnMapper tdHygfJpInverterWarnMapper;
+
+    @Autowired
+    HYGFMaintenanceTicketsMapper hygfMaintenanceTicketsMapper;
+
+    /**
+     * 分页查询
+     */
+    public Page<HYGFMaintenanceTicketsDto> queryForHYGFMaintenanceTicketsDtoPage(int current, int size, HYGFMaintenanceTicketsDto hygfMaintenanceTicketsDto) {
+        PageHelper.startPage(current, size);
+        List<HYGFMaintenanceTicketsDto> hygfMaintenanceTicketsDtos = this.getBaseMapper().qureyListByQueryparams(hygfMaintenanceTicketsDto);
+        PageInfo<HYGFMaintenanceTicketsDto> page = new PageInfo<>(hygfMaintenanceTicketsDtos);
+        Page<HYGFMaintenanceTicketsDto> pageNew = new Page<>();
+        pageNew.setCurrent(current);
+        pageNew.setTotal(page.getTotal());
+        pageNew.setSize(size);
+        pageNew.setRecords(page.getList());
+        return pageNew;
+    }
+
+    public List<String> queryInverterSncodesByStationId(String stationId) {
+        return this.getBaseMapper().queryInverterSncodesByStationId(stationId);
+    }
+
+    public HYGFMaintenanceTickets getDetailBySequenceNbr(Long sequenceNbr) {
+        return this.getBaseMapper().selectById(sequenceNbr);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<HYGFMaintenanceTicketsDto> queryHYGFMaintenanceTicketsDtoList() {
+        return this.queryForList("", false);
+    }
+
+    public void sendMeassageToMcb(HYGFMaintenanceTicketsDto hygfMaintenanceTicketsDto) {
+        HashMap<String, Object> messageMain = new HashMap<>();
+        HashMap<String, Object> rawData = new HashMap<>();
+        HashMap<String, Object> bizInfo = new HashMap<>();
+        HashMap<String, Object> specialMap = new HashMap<>();
+        List<RiskDynamicDetailsVo> riskDynamicDetailsVoList = new ArrayList<>();
+        RiskDynamicDetailsVo riskDynamicDetailsVo = new RiskDynamicDetailsVo();
+        riskDynamicDetailsVo.setSpecialMap(specialMap);
+        //电站id
+        specialMap.put("stationId", hygfMaintenanceTicketsDto.getStationId());
+        //电站名称
+        specialMap.put("stationName", hygfMaintenanceTicketsDto.getStationName());
+        specialMap.put("inverterSncode", hygfMaintenanceTicketsDto.getInverterSn());
+        //告警id
+        specialMap.put("warningId", hygfMaintenanceTicketsDto.getWarningId());
+        specialMap.put("taskStartTime", hygfMaintenanceTicketsDto.getTaskStartTime());
+        specialMap.put("taskEndTime", hygfMaintenanceTicketsDto.getTaskEndTime());
+        if (ObjectUtil.isNotEmpty(hygfMaintenanceTicketsDto.getWarningId())) {
+            //告警内容
+            specialMap.put("warningContent", hygfMaintenanceTicketsDto.getWarningContent());
+            //告警等级
+            specialMap.put("warningLevel", hygfMaintenanceTicketsDto.getWarningLevel());
+            //告警状态
+            specialMap.put("warningStatus", hygfMaintenanceTicketsDto.getWarningStatus());
+            //告警开始时间
+            specialMap.put("warningStartTime", hygfMaintenanceTicketsDto.getWarningStartTime());
+        }
+        specialMap.put("maintenancePersonId", hygfMaintenanceTicketsDto.getMaintenancePersonId());
+        //电站联系人
+        specialMap.put("stationContact", hygfMaintenanceTicketsDto.getStationContact());
+        //电站电话
+        specialMap.put("stationContactPhone", hygfMaintenanceTicketsDto.getStationContactPhone());
+        //场站地址
+        specialMap.put("stationAddress", hygfMaintenanceTicketsDto.getStationAddress());
+        //业主姓名
+        specialMap.put("ownerName", hygfMaintenanceTicketsDto.getOwnerName());
+        //告警等级
+        specialMap.put("warningLevel", hygfMaintenanceTicketsDto.getWarningLevel());
+        //告警内容
+        specialMap.put("warningContent", hygfMaintenanceTicketsDto.getWarningContent());
+        //告警状态
+        riskDynamicDetailsVoList.add(riskDynamicDetailsVo);
+        bizInfo.put("sourceAttributionDesc", hygfMaintenanceTicketsDto.getStationName());
+        bizInfo.put("sourceAttribution", hygfMaintenanceTicketsDto.getStationName());
+        bizInfo.put("dynamicDetails", riskDynamicDetailsVoList);
+        bizInfo.put("warningObjectCode", hygfMaintenanceTicketsDto.getInverterSn());
+        bizInfo.put("warningTime", DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN));
+        bizInfo.put("warningObjectName", hygfMaintenanceTicketsDto.getStationName());
+
+        rawData.put("traceId", hygfMaintenanceTicketsDto.getInverterSn());
+        rawData.put("bizInfo", bizInfo);
+        rawData.put("indexKey", hygfMaintenanceTicketsDto.getInverterSn());
+        rawData.put("dataSource", "户用光伏-告警");
+        rawData.put("indexValue", hygfMaintenanceTicketsDto.getInverterSn());
+        messageMain.put("rawData", rawData);
+//        BizMessage bizMessage = new BizMessage();
+//        bizMessage.setIndexKey(hygfMaintenanceTicketsDto.getStationName());
+//        bizMessage.setIndexValue(hygfMaintenanceTicketsDto.getInverterSn());
+//        RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
+//        riskBizInfoVo.setWarningObjectName(hygfMaintenanceTicketsDto.getStationName());
+//        riskBizInfoVo.setWarningObjectCode(idxBizPvWarningRecord.getKks());
+//        riskBizInfoVo.setSourceAttribution(stationMap.get(idxBizPvWarningRecord.getGatewayId()).getProjectOrgCode());
+//        riskBizInfoVo.setSourceAttributionDesc(idxBizPvWarningRecord.getStation());
+//        riskBizInfoVo.setWarningObjectType("hygfmaintenance");
+//        riskBizInfoVo.setWarningTime(DateUtil.now());
+//        riskBizInfoVo.setWarningObjectLinkUrl(null);
+//        List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>();
+//        RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo();
+//        dynamicDetailsVo.setTabName("预警详情");
+//        List<TableContentVo> tabContent  =new ArrayList<>();
+//        TableContentVo tableContentVo1=new TableContentVo("1", "场站名称",  idxBizPvWarningRecord.getStation(), "text");
+//        TableContentVo tableContentVo3=new TableContentVo("2", "子阵",  idxBizPvWarningRecord.getSubarray(), "text");
+//        TableContentVo tableContentVo2=new TableContentVo("3", "设备名称",  idxBizPvWarningRecord.getEquipmentName(), "text");
+//        TableContentVo tableContentVo4=new TableContentVo("4", "分析变量",  idxBizPvWarningRecord.getPointName(), "text");
+//        TableContentVo tableContentVo5=new TableContentVo("5", "健康状态指数",  idxBizPvWarningRecord.getHealthIndex(), "text");
+//        TableContentVo tableContentVo6=new TableContentVo("6", "健康等级",  idxBizPvWarningRecord.getHealthLevel(), "text");
+//        TableContentVo tableContentVo7=new TableContentVo("7", "预警周期",  idxBizPvWarningRecord.getWarningPeriod(), "text");
+//        TableContentVo tableContentVo8=new TableContentVo("8", "预警时间",  idxBizPvWarningRecord.getRecDate(), "text");
+//        TableContentVo tableContentVo10=new TableContentVo("9", "预警等级",  idxBizPvWarningRecord.getWarningName(), "text");
+//        TableContentVo tableContentVo11=new TableContentVo("10", "预警原因",  idxBizPvWarningRecord.getContent(), "text");
+//        tabContent.add(tableContentVo1);
+//        tabContent.add(tableContentVo2);
+//        tabContent.add(tableContentVo3);
+//        tabContent.add(tableContentVo4);
+//        tabContent.add(tableContentVo5);
+//        tabContent.add(tableContentVo6);
+//        tabContent.add(tableContentVo7);
+//        tabContent.add(tableContentVo8);
+//        tabContent.add(tableContentVo10);
+//        tabContent.add(tableContentVo11);
+//        dynamicDetailsVo.setTabContent(tabContent);
+//        detailsVos.add(dynamicDetailsVo);
+//        riskBizInfoVo.setDynamicDetails(detailsVos);
+//        bizMessage.setBizInfo(riskBizInfoVo);
+        // 子系统@健康指数@预警周期
+//        String traceId2 = idxBizPvWarningRecord.getSubarray()+"@"+idxBizPvWarningRecord.getHealthLevel()+"@"+idxBizPvWarningRecord.getWarningPeriod();
+//        bizMessage.setTraceId2(traceId2);
+        try {
+            emqKeeper.getMqttClient().publish(WARNING_RESULT_MESSAGE, JSON.toJSONString(messageMain).getBytes(StandardCharsets.UTF_8), 2, false);
+        } catch (Exception exception) {
+            exception.printStackTrace();
+        }
+    }
+
+    public HYGFMaintenanceTicketsDto updateHYGFMaintenanceTicketsDto(HYGFMaintenanceTicketsDto hygfMaintenanceTicketsDto) {
+        hygfMaintenanceTicketsDto.setHandlerStatus("已处理");
+        if(hygfMaintenanceTicketsDto.getWarningId()>0){
+            hygfMaintenanceTicketsDto.setTaskEndTime(new Date());
+            Long day = DateUtil.between(hygfMaintenanceTicketsDto.getWarningStartTime(),hygfMaintenanceTicketsDto.getTaskEndTime(), DateUnit.DAY);
+            Long hour = DateUtil.between(hygfMaintenanceTicketsDto.getWarningStartTime(),hygfMaintenanceTicketsDto.getTaskEndTime(), DateUnit.HOUR)-day*24;
+            Long minute = DateUtil.between(hygfMaintenanceTicketsDto.getWarningStartTime(),hygfMaintenanceTicketsDto.getTaskEndTime(), DateUnit.MINUTE)-day*24*60;
+            hygfMaintenanceTicketsDto.setWarningDuration(day+"天"+hour+"小时"+minute+"分钟");
+        }else {
+            Long day = DateUtil.between(hygfMaintenanceTicketsDto.getTaskStartTime(),hygfMaintenanceTicketsDto.getRecDate(), DateUnit.DAY);
+            Long hour = DateUtil.between(hygfMaintenanceTicketsDto.getTaskStartTime(),hygfMaintenanceTicketsDto.getRecDate(), DateUnit.HOUR)-day*24;
+            Long minute = DateUtil.between(hygfMaintenanceTicketsDto.getTaskStartTime(),hygfMaintenanceTicketsDto.getRecDate(), DateUnit.MINUTE)-day*24*60;
+            hygfMaintenanceTicketsDto.setWarningDuration(day+"天"+hour+"小时"+minute+"分钟");
+        }
+        this.updateWithModel(hygfMaintenanceTicketsDto);
+        if(ObjectUtil.isNotEmpty(hygfMaintenanceTicketsDto.getWarningId())){
+            TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(hygfMaintenanceTicketsDto.getWarningId(), hygfMaintenanceTicketsDto.getInverterSn(), hygfMaintenanceTicketsDto.getStationId());
+            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
+                tdHygfJpInverterWarn.setHandlerStatus("已处理");
+            }
+            tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
+        }
+        log.info("更新运维工单成功{}", JSON.toJSONString(hygfMaintenanceTicketsDto));
+        return hygfMaintenanceTicketsDto;
+    }
+}

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

@@ -4,15 +4,14 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 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.DayGenerate;
-import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
-import com.yeejoin.amos.boot.module.hygf.api.entity.MonthGenerate;
-import com.yeejoin.amos.boot.module.hygf.api.entity.YearGenerate;
+import com.yeejoin.amos.boot.module.hygf.api.entity.*;
+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.service.IJpStationService;
 import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.DayGenerateMapper;
@@ -46,6 +45,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
     @Autowired
     JpStationMapper jpStationMapper;
     @Autowired
+    JpInverterMapper jpInverterMapper;
+    @Autowired
     MonthPowerMapper monthPowerMapper;
     @Autowired
     MonthPowerServiceImpl monthPowerServiceImpl;
@@ -175,6 +176,16 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
         return jpStationMapper.getcountStatetc(reviewDto);
     }
 
+
+    public List<JpStation>getJpStationList (JpStationDto reviewDto){
+        List<JpInverter> dataJpInverter=jpInverterMapper.selectList(new QueryWrapper<JpInverter>().isNotNull("third_station_id"));
+        Map<String,List<String>> inverterMap=dataJpInverter.stream().collect(Collectors.groupingBy(JpInverter::getThirdStationId,Collectors.mapping(JpInverter::getSnCode,Collectors.toList())));
+        List<JpStation> list= jpStationMapper.getJpStationList(reviewDto);
+        list.forEach(jpStation -> {
+            jpStation.setSnCodes(inverterMap.get(jpStation.getThirdStationId()));
+        });
+        return list;
+    }
     @Override
     @UserLimits
     public Map<String, Object> getcountStatejs(JpStationDto reviewDto) {

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.MaintenanceFile;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.MaintenanceFileMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IMaintenanceFileService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceFileDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 运维人员文件服务实现类
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Service
+public class MaintenanceFileServiceImpl extends BaseService<MaintenanceFileDto,MaintenanceFile,MaintenanceFileMapper> implements IMaintenanceFileService {
+    /**
+     * 分页查询
+     */
+    public Page<MaintenanceFileDto> queryForMaintenanceFilePage(Page<MaintenanceFileDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<MaintenanceFileDto> queryForMaintenanceFileList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.MaintenanceLog;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.MaintenanceLogMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IMaintenanceLogService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceLogDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 运维人员操作记录服务实现类
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Service
+public class MaintenanceLogServiceImpl extends BaseService<MaintenanceLogDto,MaintenanceLog,MaintenanceLogMapper> implements IMaintenanceLogService {
+    /**
+     * 分页查询
+     */
+    public Page<MaintenanceLogDto> queryForMaintenanceLogPage(Page<MaintenanceLogDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<MaintenanceLogDto> queryForMaintenanceLogList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.MaintenanceTypeEnum;
+import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
+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.IMaintenanceService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto;
+import com.yeejoin.amos.boot.module.hygf.api.util.DesUtil;
+import com.yeejoin.amos.boot.module.hygf.api.util.MaintenanceUtil;
+import com.yeejoin.amos.boot.module.standard.api.entity.PublicAgencyUser;
+import com.yeejoin.amos.boot.module.standard.api.mapper.PublicAgencyUserMapper;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import net.sf.json.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+
+import java.util.*;
+
+/**
+ * 运维人员服务实现类
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Service
+public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenance,MaintenanceMapper> implements IMaintenanceService {
+
+    @Autowired
+    RegionalCompaniesMapper regionalCompaniesMapper;
+    @Autowired
+    private UnitInfoServiceImpl unitInfoService;
+    @Autowired
+    MaintenanceFileServiceImpl maintenanceFileServiceImpl;
+    @Autowired
+    MaintenanceFileMapper maintenanceFileMapper;
+    @Autowired
+    MaintenanceMapper maintenanceMapper;
+    @Autowired
+    PublicAgencyUserMapper publicAgencyUserMapper;
+    @Autowired
+    MaintenanceLogMapper maintenanceLogMapper;
+    @Value("${dealer.appcode.manage}")
+    private String appCodes;
+
+
+    @Value("${dealer.amosDealerId}")
+    private Long amosDealerId;
+
+
+    @Value("${dealer.appcode.role}")
+    private Long role;
+
+    @Autowired
+    RedisUtils redisUtil;
+    private static final String regionRedis="app_region_redis";
+
+    private static final Integer isSignAnAgreement = 1;
+
+    @Value("${amos.secret.key}")
+    String secretKey;
+    /**
+     * 分页查询
+     */
+    public Page<MaintenanceDto> queryForMaintenancePage( int current,int size,String name, String maintenanceTypeCode,  String lockStatus, String reviewStatus,Long regionalCompaniesSeq, Long dealerId
+    ,String maintenanceType,String maintenanceAreaAddress)   {
+
+        PageHelper.startPage(current,  size);
+        List<MaintenanceDto> resultPage = maintenanceMapper.Maintenancepage( name,  maintenanceTypeCode,   lockStatus,  reviewStatus, regionalCompaniesSeq,  dealerId,maintenanceType,maintenanceAreaAddress);
+        PageInfo<MaintenanceDto> page = new PageInfo(resultPage);
+        Page<MaintenanceDto> pagenew = new Page<MaintenanceDto>();
+        pagenew.setCurrent(current);
+        pagenew.setTotal(page.getTotal());
+        pagenew.setSize(size);
+        pagenew.setRecords(page.getList());
+        return pagenew;
+
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<MaintenanceDto> queryList(
+            String name, //运维人员类型
+            String maintenanceType //运维人员类型code
+    ){
+        List<MaintenanceDto> lisda=  maintenanceMapper.queryList(
+                 name, //运维人员类型
+                 maintenanceType //运维人员类型cod
+        );
+     return lisda;
+    }
+
+
+    @Transactional
+    public Maintenance saveMaintenance(Maintenance model ){
+
+        //验证账号是否已存在
+        Integer numm= maintenanceMapper.selectauthLogininfo(model.getTelephone(),model.getAdminLoginName());
+
+        //验证手机号是否已注册
+        Integer numz=   maintenanceMapper.selectMaintenance(model.getTelephone(),model.getAdminLoginName());
+
+        if(numm>0||numz>0){
+            throw new BadRequest("请检查，账号或号码，已存在！");
+        }
+
+        //审核状态
+        model.setReviewStatus(MaintenanceUtil.SHZ);
+
+        //培训状态
+        model.setTrainingStatus(MaintenanceUtil.WPX);
+        //是否锁定
+        model.setLockStatus(MaintenanceUtil.OK);
+        //签订协议
+        model.setIsSignAnAgreement(MaintenanceUtil.WQD);
+        //设置区域公司
+        RegionalCompanies regionalCompanies= regionalCompaniesMapper.selectRegionName(model.getRegionalCompaniesSeq());
+        model.setRegionalCompaniesCode(regionalCompanies!=null?regionalCompanies.getRegionalCompaniesCode():null);
+        model.setRegionalCompaniesName(regionalCompanies!=null?regionalCompanies.getRegionalCompaniesName():null);
+        //设置经销商
+        UnitInfo unitInfo= unitInfoService.getById(model.getDealerId());
+        model.setAmosDealerCode(unitInfo!=null?unitInfo.getAmosCompanyCode():null);
+        model.setAmosDealerId(unitInfo!=null?unitInfo.getAmosCompanySeq():null);
+        model.setDealerId(unitInfo!=null?unitInfo.getSequenceNbr():null);
+        model.setDealerName(unitInfo!=null?unitInfo.getName():null);
+        //运维区域 name
+        JSONArray regionName = getRegionName();
+        List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
+        if(model.getMaintenanceAreaCode()!=null){
+            String ConsigneeRegion="";
+            List<Integer>  da=model.getMaintenanceAreaCode();
+            if(da!=null&&!da.isEmpty()){
+                for (int i = 0; i < da.size(); i++) {
+                    for (RegionModel re : list) {
+                        if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) {
+                            if(da.size()-1==i){
+                                ConsigneeRegion = ConsigneeRegion + re.getRegionName();
+                            }else{
+                                ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-";
+                            }
+                            break;
+                        }
+                    }
+                }
+                model.setMaintenanceArea(ConsigneeRegion);
+            }
+        }
+        //设置常住地址
+        if(model.getPermanentAddressCode()!=null){
+            String ConsigneeRegion="";
+            List<Integer>  da=model.getPermanentAddressCode();
+            if(da!=null&&!da.isEmpty()){
+                for (int i = 0; i < da.size(); i++) {
+                    for (RegionModel re : list) {
+                        if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) {
+                            if(da.size()-1==i){
+                                ConsigneeRegion = ConsigneeRegion + re.getRegionName();
+                            }else{
+                                ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-";
+                            }
+                            break;
+                        }
+                    }
+                }
+                model.setPermanentAddressName(ConsigneeRegion);
+            }
+        }
+        //存储std
+        //新增人员基础信息表
+        PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
+        publicAgencyUser.setRealName(model.getName());
+        publicAgencyUser.setIdType(model.getIdType());
+        publicAgencyUser.setIdNumber(model.getIdCard());
+        publicAgencyUser.setAmosId(model.getAmosDealerId());
+        publicAgencyUser.setAmosOrgCode(model.getAmosDealerCode());
+        publicAgencyUser.setAmosUserId(model.getAmosUserId());
+        publicAgencyUser.setAmosUserName(model.getAdminLoginName());
+        publicAgencyUser.setPassword(DesUtil.encode(model.getAdminLoginPwd(), secretKey));
+        publicAgencyUser.setRole(null);
+        publicAgencyUser.setLockStatus("LOCK");
+        publicAgencyUser.setLockTime(new Date());
+        publicAgencyUser.setEmergencyTelephone(model.getTelephone());
+        publicAgencyUser.setIdCardFront(model.getIdCardFront()!=null?JSON.toJSONString(model.getIdCardFront()):null);
+        publicAgencyUser.setIdCardOpposite(model.getIdCardOpposite()!=null?JSON.toJSONString(model.getIdCardOpposite()):null);
+        publicAgencyUserMapper.insert(publicAgencyUser);
+
+        //保存运维人员
+        model.setFoundationId(publicAgencyUser.getSequenceNbr());
+        maintenanceMapper.insert(model);
+        //保存证书
+        if(model.getMaintenanceFiles()!=null){
+            List<MaintenanceFile> maintenanceFiles=  model.getMaintenanceFiles();
+            for (MaintenanceFile maintenanceFile : maintenanceFiles) {
+                maintenanceFile.setMaintenanceId(model.getSequenceNbr());
+            }
+            maintenanceFileServiceImpl.saveBatch(maintenanceFiles);
+        }
+
+
+
+
+        return model;
+    }
+
+    public JSONArray getRegionName() {
+        JSONArray jsonArray = new JSONArray();
+        if (redisUtil.hasKey(regionRedis)) {
+            jsonArray = JSONArray.parseArray(redisUtil.get(regionRedis).toString());
+        } else {
+            Collection<RegionModel> regionChild = new ArrayList<>();
+            RegionModel regionModel1 = new RegionModel();
+            regionChild.add(regionModel1);
+            FeignClientResult<Collection<RegionModel>> collectionFeignClientResult = Systemctl.regionClient.queryForTreeParent(610000L);
+            Collection<RegionModel> result = collectionFeignClientResult.getResult();
+            for (RegionModel regionModel : result) {
+                if (null != regionModel && null != regionModel.getChildren()) {
+                    for (RegionModel child : regionModel.getChildren()) {
+                        if (null != child && null != child.getChildren()) {
+                            for (RegionModel childChild : child.getChildren()) {
+                                jsonArray.add(childChild);
+                            }
+                            child.setChildren(regionChild);
+                            jsonArray.add(child);
+                        }
+                    }
+                    regionModel.setChildren(regionChild);
+                    jsonArray.add(regionModel);
+                }
+            }
+
+            redisUtil.set(regionRedis, jsonArray);
+        }
+        return jsonArray;
+    }
+
+    //详情
+    public Map<String,Object>  selectOneById(Long sequenceNbr){
+     MaintenanceDto maintenanceDto=    maintenanceMapper.selectOneById(sequenceNbr);
+
+        maintenanceDto.setIdCardFrontList(maintenanceDto.getIdCardFront()!=null?JSONArray.parseArray(maintenanceDto.getIdCardFront()):null);
+        maintenanceDto.setIdCardOppositeList(maintenanceDto.getIdCardFront()!=null?JSONArray.parseArray(maintenanceDto.getIdCardOpposite()):null);
+
+     //获取文档
+      List<MaintenanceFile>   list=  maintenanceFileMapper.selectList(
+                new QueryWrapper<MaintenanceFile>().lambda().eq(MaintenanceFile::getMaintenanceId, sequenceNbr)
+      );
+        maintenanceDto.setMaintenanceFiles(list);
+      Map<String,Object>  jsonObject= BeanUtil.beanToMap(maintenanceDto);
+       if(list!=null&&!list.isEmpty()){
+           for (MaintenanceFile maintenanceFile : list) {
+               jsonObject.put(maintenanceFile.getFileKey(),maintenanceFile.getFileUrl());
+               jsonObject.put(maintenanceFile.getFileKey()+"effectiveDateEnd",maintenanceFile.getEffectiveDateEnd());
+               jsonObject.put(maintenanceFile.getFileKey()+"effectiveDateStart",maintenanceFile.getEffectiveDateStart());
+           }
+       }
+        return jsonObject;
+    }
+
+    @Transactional
+    public Maintenance examine(Long sequenceNbr, MaintenanceLog maintenanceLog) {
+
+
+        //保存操作日志
+        maintenanceLog.setMaintenanceId(sequenceNbr);
+        maintenanceLogMapper.insert(maintenanceLog);
+        //判断审核状态
+        Maintenance maintenance = maintenanceMapper.selectById(sequenceNbr);
+        MaintenanceDto maintenanceDto = maintenanceMapper.selectOneById(sequenceNbr);
+
+        if (maintenanceLog.getOperationResults().equals(MaintenanceUtil.BH)) {
+            maintenance.setReviewStatus(MaintenanceUtil.BH);
+            maintenanceMapper.updateById(maintenance);
+            return maintenance;
+        } else {
+            //如果通过添加平台账号
+            maintenance.setReviewStatus(MaintenanceUtil.TG);
+
+            FeignClientResult<AgencyUserModel> userResult = null;
+            //新增平台用户
+            try {
+                // 1 创建平台用户
+                List<RoleModel> userRoleList = new ArrayList<>();
+                AgencyUserModel agencyUserModel = new AgencyUserModel();
+                agencyUserModel.setUserName(maintenanceDto.getAdminLoginName());
+                agencyUserModel.setRealName(maintenanceDto.getName());
+                agencyUserModel.setLockStatus("UNLOCK");
+                agencyUserModel.setPassword(maintenanceDto.getAdminLoginPwd());
+                agencyUserModel.setRePassword(maintenanceDto.getAdminLoginPwd());
+                agencyUserModel.setAgencyCode("JXIOP");
+                agencyUserModel.setMobile(maintenanceDto.getTelephone());
+                List<String> split = Arrays.asList(StringUtils.split(appCodes, ','));
+                Map<Long, List<Long>> roleSeqMap = new HashMap<>();
+                Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
+                List<Long> roleIds = new ArrayList<>();
+                roleIds.add(role);
+
+                if(maintenanceDto.getMaintenanceTypeCode().equals(MaintenanceTypeEnum.社会人员运维.getCode())){
+                    roleSeqMap.put(amosDealerId, roleIds);
+                    orgRoles.put(amosDealerId, userRoleList);
+
+                }else{
+                    roleSeqMap.put(Long.valueOf(maintenanceDto.getAmosDealerId()), roleIds);
+                    orgRoles.put(Long.valueOf(maintenanceDto.getAmosDealerId()), userRoleList);
+
+                }
+                agencyUserModel.setOrgRoles(orgRoles);
+                agencyUserModel.setOrgRoleSeqs(roleSeqMap);
+                // 将创建用户加入用户组
+                userResult = Privilege.agencyUserClient.create(agencyUserModel);
+                if (userResult == null || userResult.getStatus() != 200) {
+                    throw new BadRequest("新增人员失败！" + userResult.getDevMessage());
+                }
+                List<String> userId = new ArrayList<>();
+                userId.add(userResult.getResult().getUserId());
+                for (Long aLong : roleIds) {
+                    Privilege.groupUserClient.create(aLong, userId);
+                }
+                //修改基础表
+                PublicAgencyUser publicAgencyUser = publicAgencyUserMapper.selectById(maintenance.getFoundationId());
+                //新增人员基础信息表
+                publicAgencyUser.setAmosUserId(userResult.getResult().getUserId());
+                publicAgencyUser.setLockStatus("UNLOCK");
+                publicAgencyUser.setLockTime(new Date());
+                publicAgencyUser.setRole(JSON.toJSONString(roleIds));
+                publicAgencyUserMapper.updateById(publicAgencyUser);
+                maintenanceMapper.updateById(maintenance);
+                return maintenance;
+            } catch (Exception e) {
+                if (userResult != null && userResult.getResult() != null
+                        && StringUtils.isNotEmpty(userResult.getResult().getUserId())) {
+                    Privilege.agencyUserClient.multDeleteUser(userResult.getResult().getUserId());
+                }
+                log.error(e.getMessage(), e);
+                throw new BadRequest(e.getMessage());
+            }
+
+        }
+
+    }
+
+
+   public void updateTraining(String userId){
+        this.getBaseMapper().updateTraining(userId);
+   }
+
+   public void updateTrainingAgreement(String userId){
+        this.getBaseMapper().updateTrainingAgreement(userId);
+   }
+
+
+
+
+    @Transactional
+    public void updateUser( Long sequenceNbr , String type){
+
+        FeignClientResult<List<String>>  userResult =null;
+        MaintenanceDto maintenanceDto=    maintenanceMapper.selectOneById(sequenceNbr);
+
+        PublicAgencyUser publicAgencyUser = publicAgencyUserMapper.selectById(maintenanceDto.getFoundationId());
+
+        if("LOCK".equals(type)){
+            userResult =   Privilege.agencyUserClient.lockUsers(publicAgencyUser.getAmosUserId());
+
+            publicAgencyUser.setLockStatus("LOCK");
+        }else{
+            userResult = Privilege.agencyUserClient.unlockUsers(publicAgencyUser.getAmosUserId());
+            publicAgencyUser.setLockStatus("UNLOCK");
+        }
+        publicAgencyUser.setLockTime(new Date());
+
+        publicAgencyUserMapper.updateById(publicAgencyUser);
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.MaintenanceTraining;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.MaintenanceTrainingMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IMaintenanceTrainingService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceTrainingDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Service
+public class MaintenanceTrainingServiceImpl extends BaseService<MaintenanceTrainingDto,MaintenanceTraining,MaintenanceTrainingMapper> implements IMaintenanceTrainingService {
+
+    @Autowired
+    MaintenanceServiceImpl maintenanceService;
+    /**
+     * 分页查询
+     */
+    public Page<MaintenanceTrainingDto> queryForMaintenanceTrainingPage(Page<MaintenanceTrainingDto> page)   {
+
+
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<MaintenanceTrainingDto> queryForMaintenanceTrainingList()   {
+        return this.queryForList("" , false);
+    }
+
+
+
+     @Transactional
+    public void selectTrainingStatus(MaintenanceTrainingDto model,String userId){
+
+        model = this.createWithModel(model);
+        //查询培训科目总数及当前已学习总数
+        Map<String, Long> map = this.getBaseMapper().selectTrainingStatus(userId);
+        Long total = map.get("total");
+        Long num = map.get("num");
+        //如果相减是0 即已学习完 反之为学习完
+        if ((total - num) == 0){
+            //如果是true 则已学习完 需修改运维人员的培训状态为完成 当为完成时  运维方可进行工单业务
+         maintenanceService.updateTraining(model.getUserId());
+
+        }
+
+    }
+}
\ No newline at end of file

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

@@ -8,22 +8,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.HouseholdContractEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationNodeEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.WorkDto;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
+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;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationService;
 import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+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;
@@ -81,7 +78,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     UserMessageMapper userMessageMapper;
     @Autowired
     PowerStationMapper powerStationMapper;
-
+    @Autowired
+    AmosRequestContext requestContext;
+    @Autowired
+    WorkflowImpl workflow;
 
     public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode, String ownersName, AgencyUserModel userInfo){
         String serviceAgent =null;
@@ -152,13 +152,13 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     public boolean savePowerStation(PowerStation powerStation, boolean flag,String name,String meg) {
         try{
             //流程节点code
-            if (flag) {
-                String flowTaskIdnext = this.getTaskNoAuth(powerStation.getProcessInstanceId());
-                WorkDto workDto=this.getNodeInfoCode(flowTaskIdnext);
-                powerStation.setNextProcessNode(workDto.getNextProcessNode());
-                powerStation.setNodeRole(workDto.getNodeRole());
-                powerStation.setNodeRouting(workDto.getNodeRouting());
-            }
+//            if (flag) {
+//                String flowTaskIdnext = this.getTaskNoAuth(powerStation.getProcessInstanceId());
+//                WorkDto workDto=this.getNodeInfoCode(flowTaskIdnext);
+//                powerStation.setNextProcessNode(workDto.getNextProcessNode());
+//                powerStation.setNodeRole(workDto.getNodeRole());
+//                powerStation.setNodeRouting(workDto.getNodeRouting());
+//            }
 
             powerStation.setRecDate(new Date());
 
@@ -271,17 +271,55 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
         String code = null;
         try{
             // 3. 工作流执行
-            FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, null, null, kv);
-            if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
-                code = submit.getResult();
-                log.info("流程执行成功：{}", code);
+          //  FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, null, null, kv);
+           // if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
+            //    code = submit.getResult();
+            //    log.info("流程执行成功：{}", code);
                 // 获取流程信息
-                FeignClientResult<JSONObject> record = idxFeginService.getRecord(code);
-                if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
-                    JSONObject resultObj = record.getResult();
-                    String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
-                    powerStation.setFlowTaskId(flowTaskId);
-                }
+//                FeignClientResult<JSONObject> record = idxFeginService.getRecord(code);
+//                if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
+//                    JSONObject resultObj = record.getResult();
+//                    String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
+//
+//                }
+
+
+                //执行工作流
+            BasicGridAcceptance basicGridAcceptance=new BasicGridAcceptance();
+            StandardDto standardDto = new StandardDto();
+            if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)||PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
+
+                standardDto.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):"");
+                standardDto.setResult("0");
+                standardDto.setTaskId(powerStation.getFlowTaskId());
+                VariableDto variable = new VariableDto();
+                variable.setApprovalStatus("0");
+                variable.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):"");
+                variable.setOperationTime(String.valueOf(kv.get("approveDate")));
+                variable.setOperator("");
+                standardDto.setVariable(variable);
+            }else{
+                standardDto.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):"");
+                standardDto.setResult(String.valueOf(kv.get("approvalStatus")));
+                standardDto.setTaskId(powerStation.getFlowTaskId());
+                VariableDto variable = new VariableDto();
+                variable.setApprovalStatus(String.valueOf(kv.get("approvalStatus")));
+                variable.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):"");
+                variable.setOperationTime(String.valueOf(kv.get("approveDate")));
+                variable.setOperator(String.valueOf(kv.get("approveName")));
+                standardDto.setVariable(variable);
+            }
+
+
+                BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto, requestContext.getUserId());
+                powerStation.setFlowTaskId(basicGridAcceptance.getNextTaskId());
+                powerStation.setNodeRole(basicGridAcceptance.getNextExecutorIds());
+                powerStation.setNodeRouting(basicGridAcceptance.getNextNodeKey()!=null?PowerStationEnum.getNodeByKey(basicGridAcceptance.getNextNodeKey()):"");
+                powerStation.setNextProcessNode(basicGridAcceptance.getNextNodeKey());
+                powerStation.setPromoter(basicGridAcceptance.getPromoter());
+                powerStation.setNextExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds());
+                powerStation.setNextNodeName(basicGridAcceptance.getNextNodeName());
+
                 powerStationService.savePowerStation(powerStation, flag,powerStation.getOwnersName(),meg);
                 if(!flag){
                     //更新农户状态
@@ -290,12 +328,94 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
                     peasantHousehold.setSurveyOrNot(3);
                     peasantHouseholdService.saveOrUpdate(peasantHousehold);
                 }
-            }
+            //}
         }catch (Exception e){
+            e.printStackTrace();
             throw new  BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
 
         }
         return code;
+
+
+
+
+
+//        String meg="";
+//        // 1. 业务相关数据落表
+//        PowerStation powerStation = this.baseMapper.selectById(stationId);
+//        PowerStationNodeEnum nodeByCode = PowerStationNodeEnum.getNodeByCode(nodeCode);
+//        String result = String.valueOf(kv.get("approvalStatus"));
+//        boolean flag = true;
+//        if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)||PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
+//
+//            powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName());
+//
+//            this.updateSeve(nodeCode,powerStation.getPeasantHouseholdId(),kv);
+//        }  else {
+//
+//            if (VERIFY_RESULT_NO.equals(result)) {
+//                powerStation.setProcessStatus(PowerStationProcessStateEnum.不通过.getName());
+//            }
+//            PowerStationProcessStateEnum resultObj = PowerStationProcessStateEnum.getStateByResult(result);
+//            switch (nodeByCode) {
+//                case 设计审核:
+//                    powerStation.setTechnologyStatus(resultObj.getName());
+//                    break;
+//                case 投融审核:
+//                    powerStation.setDesignStatus(resultObj.getName());
+//                    break;
+//                case 法务审核:
+//                    powerStation.setBusinessStatus(resultObj.getName());
+//
+//                    if (VERIFY_RESULT_YES.equals(result)) {
+//                        LambdaUpdateWrapper<HouseholdContract> lambdaUw = new LambdaUpdateWrapper<>();
+//                        lambdaUw.eq(HouseholdContract::getPeasantHouseholdId, powerStation.getPeasantHouseholdId());
+//                        lambdaUw.set(HouseholdContract::getSurveyStatus, HouseholdContractEnum.勘察状态_已勘察.getCode());
+//                        householdContractServiceImpl.update(lambdaUw);
+//                    }
+//
+//                    break;
+//                case 文件审核:
+//                    if (VERIFY_RESULT_YES.equals(result)) {
+//                        flag = false;
+//                        powerStation.setProcessStatus(PowerStationProcessStateEnum.完成.getName());
+//                    }
+//                    powerStation.setDrawingReview(resultObj.getName());
+//                    break;
+//                default:
+//                    break;
+//            }
+//        }
+//        meg="任务明细："+nodeByCode+(VERIFY_RESULT_YES.equals(result)?"通过":"不通过");
+//        // 2. 更新流程状态
+//        String code = null;
+//        try{
+//            // 3. 工作流执行
+//            FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, null, null, kv);
+//            if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
+//                code = submit.getResult();
+//                log.info("流程执行成功：{}", code);
+//                // 获取流程信息
+//                FeignClientResult<JSONObject> record = idxFeginService.getRecord(code);
+//                if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
+//                    JSONObject resultObj = record.getResult();
+//                    String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
+//                    powerStation.setFlowTaskId(flowTaskId);
+//                }
+//                powerStationService.savePowerStation(powerStation, flag,powerStation.getOwnersName(),meg);
+//                if(!flag){
+//                    //更新农户状态
+//                    String peasantHouseholdId = powerStation.getPeasantHouseholdId();
+//                    PeasantHousehold peasantHousehold = peasantHouseholdService.getBaseMapper().selectById(Long.valueOf(peasantHouseholdId));
+//                    peasantHousehold.setSurveyOrNot(3);
+//                    peasantHouseholdService.saveOrUpdate(peasantHousehold);
+//                }
+//            }
+//        }catch (Exception e){
+//            throw new  BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
+//
+//        }
+//        return code;
     }
 
 

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

@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationNodeEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
 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;
@@ -21,6 +18,7 @@ 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.feign.WorkflowFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
@@ -117,6 +115,12 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
     PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
     @Autowired
     WorkOrderPowerStationMapper workOrderPowerStationMapper;
+    @Autowired
+    AmosRequestContext requestContext;
+
+    @Autowired
+    WorkflowImpl workflow;
+
     /**
      * 分页查询
      */
@@ -261,25 +265,47 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
     }
 
     private void submitExamine(PeasantHousehold peasantHousehold) {
+
+
+
+
         PowerStation powerStation = powerStationService.getObjByNhId(String.valueOf(peasantHousehold.getSequenceNbr()), PowerStationProcessStateEnum.作废.getCode());
 
         String taskId = null;
         Map<String, Object> objectMap = new HashMap<>(1);
         objectMap.put("describe", "经销商已上传信息");
-        if (ObjectUtils.isNotEmpty(powerStation)) {
-            // 工作流执行一步
-            taskId = powerStation.getTaskId();
-        } else {
-            // 第一步启动工作流
-            powerStation = new PowerStation();
-        }
+
         // 保存并审核
         try {
-            FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planId, null, "STATION_AUDIT", null, objectMap);
-            if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
+
+
+            BasicGridAcceptance basicGridAcceptance=new BasicGridAcceptance();
+            if (ObjectUtils.isNotEmpty(powerStation)) {
+                // 工作流执行一步
+               // taskId = powerStation.getTaskId();
+                StandardDto standardDto = new StandardDto();
+                standardDto.setResult("0");
+                standardDto.setTaskId(powerStation.getFlowTaskId());
+                VariableDto variable = new VariableDto();
+                variable.setApprovalStatus("0");
+                standardDto.setVariable(variable);
+                workflow.standard(basicGridAcceptance, standardDto, requestContext.getUserId());
+            } else {
+                // 第一步启动工作流
+                //发起工作流
+                // 调用工作流执行第一个节点
+                ProcessDto processDto = new ProcessDto();
+                processDto.setBusinessKey(String.valueOf(peasantHousehold.getSequenceNbr()));
+                processDto.setProcessDefinitionKey("hygf_10001");
+                StartProcessDto startProcessDto = new StartProcessDto();
+                List<ProcessDto> process=new ArrayList<>();
+                process.add(processDto);
+                startProcessDto.setProcess(process);
+                workflow.startProcess(basicGridAcceptance, startProcessDto,requestContext.getUserId());
+                powerStation=new PowerStation();
+            }
                 peasantHousehold.setSurveyOrNot(2);
                 peasantHousehold.setReview(1);
-                String code = submit.getResult();
                 // 插入记录表
                 powerStation.setPlanInstanceId(planId);
                 powerStation.setPowerStationCode(peasantHousehold.getPeasantHouseholdNo());
@@ -288,25 +314,72 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
                 powerStation.setPeasantHouseholdId(String.valueOf(peasantHousehold.getSequenceNbr()));
                 powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName());
                 powerStation.setServiceAgent(peasantHousehold.getDeveloperName());
-                log.info("流程执行成功：{}", code);
                 // 获取流程信息
-                FeignClientResult<JSONObject> record = idxFeginService.getRecord(code);
-                if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
-                    JSONObject resultObj = record.getResult();
-                    String taskIdNew = String.valueOf(resultObj.get("taskId"));
-                    String processInstanceId = String.valueOf(resultObj.get("processInstanceId"));
-                    String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
-                    powerStation.setTaskId(taskIdNew);
-                    powerStation.setProcessInstanceId(processInstanceId);
-                    powerStation.setFlowTaskId(flowTaskId);
-                    powerStation.setNextProcessNode(PowerStationNodeEnum.设计审核.getCode());
-                }
+                powerStation.setTaskId(basicGridAcceptance.getNextTaskId());
+                powerStation.setProcessInstanceId(basicGridAcceptance.getInstanceId());
+                powerStation.setFlowTaskId(basicGridAcceptance.getNextTaskId());
+                powerStation.setNodeRole(basicGridAcceptance.getNextExecutorIds());
+                powerStation.setNodeRouting(PowerStationEnum.getNodeByKey(basicGridAcceptance.getNextNodeKey()));
+                powerStation.setNextProcessNode(PowerStationNodeEnum.设计审核.getCode());
+                powerStation.setPromoter(basicGridAcceptance.getPromoter());
+                powerStation.setNextExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds());
+                powerStation.setNextNodeName(basicGridAcceptance.getNextNodeName());
+
                 powerStationService.savePowerStation(powerStation, true,powerStation.getOwnersName(),"");
-            }
+
         } catch (Exception e){
             e.printStackTrace();
             throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
         }
+
+
+
+//        PowerStation powerStation = powerStationService.getObjByNhId(String.valueOf(peasantHousehold.getSequenceNbr()), PowerStationProcessStateEnum.作废.getCode());
+//
+//        String taskId = null;
+//        Map<String, Object> objectMap = new HashMap<>(1);
+//        objectMap.put("describe", "经销商已上传信息");
+//        if (ObjectUtils.isNotEmpty(powerStation)) {
+//            // 工作流执行一步
+//            taskId = powerStation.getTaskId();
+//        } else {
+//            // 第一步启动工作流
+//            powerStation = new PowerStation();
+//        }
+//        // 保存并审核
+//        try {
+//            FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planId, null, "STATION_AUDIT", null, objectMap);
+//            if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
+//                peasantHousehold.setSurveyOrNot(2);
+//                peasantHousehold.setReview(1);
+//                String code = submit.getResult();
+//                // 插入记录表
+//                powerStation.setPlanInstanceId(planId);
+//                powerStation.setPowerStationCode(peasantHousehold.getPeasantHouseholdNo());
+//                powerStation.setOwnersName(peasantHousehold.getOwnersName());
+//                powerStation.setProjectAddress(peasantHousehold.getProjectAddressName());
+//                powerStation.setPeasantHouseholdId(String.valueOf(peasantHousehold.getSequenceNbr()));
+//                powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName());
+//                powerStation.setServiceAgent(peasantHousehold.getDeveloperName());
+//                log.info("流程执行成功：{}", code);
+//                // 获取流程信息
+//                FeignClientResult<JSONObject> record = idxFeginService.getRecord(code);
+//                if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
+//                    JSONObject resultObj = record.getResult();
+//                    String taskIdNew = String.valueOf(resultObj.get("taskId"));
+//                    String processInstanceId = String.valueOf(resultObj.get("processInstanceId"));
+//                    String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
+//                    powerStation.setTaskId(taskIdNew);
+//                    powerStation.setProcessInstanceId(processInstanceId);
+//                    powerStation.setFlowTaskId(flowTaskId);
+//                    powerStation.setNextProcessNode(PowerStationNodeEnum.设计审核.getCode());
+//                }
+//                powerStationService.savePowerStation(powerStation, true,powerStation.getOwnersName(),"");
+//            }
+//        } catch (Exception e){
+//            e.printStackTrace();
+//            throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
+//        }
     }
 
     public SurveyInfoAllDto querySurveyInfo(String surveyInformationId,String peasantHouseholdId,String processInstanceId,AgencyUserModel userInfo)   {

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.module.hygf.api.dto.HYGFMaintenanceTicketsDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HYGFMaintenanceTickets;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterWarn;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HYGFMaintenanceTicketsMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpInverterWarnService;
 import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarnMapper;
 import com.yeejoin.amos.boot.module.hygf.api.util.TimeUtil;
+import jdk.nashorn.internal.ir.annotations.Ignore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -31,6 +38,9 @@ public class TdHygfJpInverterWarnServiceImpl
 	@Autowired
 	JpStationServiceImpl jpStationServiceImpl;
 
+	@Autowired
+	HYGFMaintenanceTicketsMapper hygfMaintenanceTicketsMapper;
+
 	/**
 	 * 分页查询
 	 */
@@ -39,10 +49,10 @@ public class TdHygfJpInverterWarnServiceImpl
 		int pageNum = (int) pageParam.getCurrent();
 		int pageSize = (int) pageParam.getSize();
 		PageHelper.startPage(pageNum, pageSize);
-		if (tdHygfJpInverterWarnDto.getState() != null) {
-			String[] s = tdHygfJpInverterWarnDto.getState().split(",");
-			tdHygfJpInverterWarnDto.setStates(Arrays.asList(s));
-		}
+//		if (tdHygfJpInverterWarnDto.getState() != null) {
+//			String[] s = tdHygfJpInverterWarnDto.getState().split(",");
+//			tdHygfJpInverterWarnDto.setStates(Arrays.asList(s));
+//		}
 		if (tdHygfJpInverterWarnDto.getStationName() != null) {
 			LambdaQueryWrapper<JpStation> wapper = new LambdaQueryWrapper<JpStation>().like(JpStation::getName,
 					tdHygfJpInverterWarnDto.getStationName());
@@ -53,11 +63,17 @@ public class TdHygfJpInverterWarnServiceImpl
 			List<String> ids = sList.stream().map(i -> i.getThirdStationId()).collect(Collectors.toList());
 			tdHygfJpInverterWarnDto.setStationIds(ids);
 		}
+				if (tdHygfJpInverterWarnDto.getHandlerStatus() != null) {
+			String[] s = tdHygfJpInverterWarnDto.getHandlerStatus().split(",");
+			tdHygfJpInverterWarnDto.setListHandlerStatus(Arrays.asList(s));
+		}
 		List<TdHygfJpInverterWarnDto> list = new ArrayList<>();
 		if (tdHygfJpInverterWarnDto.getStationIds().isEmpty()) {
-
+			list = this.baseMapper.list(tdHygfJpInverterWarnDto);
 		} else {
+
 			list = this.baseMapper.list(tdHygfJpInverterWarnDto);
+
 			if (!list.isEmpty()) {
 				list.forEach(i -> {
 					JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
@@ -86,7 +102,7 @@ public class TdHygfJpInverterWarnServiceImpl
 	 * 列表查询 示例
 	 */
 	public List<TdHygfJpInverterWarnDto> queryForTdHygfJpInverterWarnList() {
-		return this.queryForList("", false);
+		return this.getBaseMapper().listAll();
 	}
 
 	public TdHygfJpInverterWarnDto queryByCreatedTime(long createdTime) {
@@ -95,6 +111,10 @@ public class TdHygfJpInverterWarnServiceImpl
 		TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto = this.baseMapper.getByTime(createdTime);
 		JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
 				.eq(JpStation::getThirdStationId, tdHygfJpInverterWarnDto.getThirdStationId()));
+		List<HYGFMaintenanceTickets> hygfMaintenanceTickets = hygfMaintenanceTicketsMapper.
+				selectList(new QueryWrapper<HYGFMaintenanceTickets>()
+						.eq("warning_id",String.valueOf(tdHygfJpInverterWarnDto.getCreatedTime()))
+						.eq("inverter_sn",String.valueOf(tdHygfJpInverterWarnDto.getSnCode())));
 		if (jpStation != null) {
 			tdHygfJpInverterWarnDto.setStationName(jpStation.getName());
 			tdHygfJpInverterWarnDto.setStationContact(jpStation.getStationContact());
@@ -113,14 +133,26 @@ public class TdHygfJpInverterWarnServiceImpl
 				tdHygfJpInverterWarnDto.setStartTimeFormat(TimeUtil.dateFormat(tdHygfJpInverterWarnDto.getStartTime()));
 			}
 		}
-
+		if(hygfMaintenanceTickets.size()>0){
+			HYGFMaintenanceTickets hygfMaintenanceTickets1 =hygfMaintenanceTickets.get(0);
+			BeanUtil.copyProperties(hygfMaintenanceTickets1,tdHygfJpInverterWarnDto, "handlerStatus");
+		}
 		return tdHygfJpInverterWarnDto;
 	}
 
-	public List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content, Integer current, Integer size){
-	return this.getBaseMapper().selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,(current-1)*size,size);
+	public List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content, Integer current, Integer size,String handlerStatus){
+	     List<TdHygfJpInverterWarnDto> list = this.getBaseMapper().selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,(current-1)*size,size,handlerStatus);
+		 list.forEach(i -> {
+			 JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
+					.eq(JpStation::getThirdStationId, i.getThirdStationId()));
+			 if(ObjectUtil.isNotNull(jpStation)){
+				 i.setAddress(jpStation.getAddress());
+		         i.setArea(jpStation.getArea());
+			 }
+		 });
+		return list;
 	}
-	public int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content){
-		return this.getBaseMapper().selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content);
+	public int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content,String handlerStatus){
+		return this.getBaseMapper().selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,handlerStatus);
 	}
 }
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.Training;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.TrainingMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.ITrainingService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.TrainingDto;
+import org.apache.ibatis.annotations.Param;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 培训信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2024-03-11
+ */
+@Service
+public class TrainingServiceImpl extends BaseService<TrainingDto,Training,TrainingMapper> implements ITrainingService {
+    /**
+     * 分页查询
+     */
+    public Page<TrainingDto> queryForTrainingPage(Page<TrainingDto> page)   {
+
+
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<TrainingDto> queryForTrainingList()   {
+        return this.queryForList("" , false);
+    }
+
+
+
+    /**
+     * 查询当前人培训资料学习状态
+     * */
+   public Page<TrainingDto> currentStudyStatusList(Integer current, Integer size, String status,
+                                                   String name){
+
+
+
+       Integer statusflag=null;
+       if(status!=null&&status.equals("未学")){
+           statusflag=0;
+       }else if(status!=null&&status.equals("已学")){
+           statusflag=1;
+       }
+        //查询当前人userId
+       String exeUserId = RequestContext.getExeUserId();
+        //通过userId查询对应运维人员培训表中的数据来区分是否学习
+       PageHelper.startPage(current,  size);
+       List<TrainingDto> resultPage= this.getBaseMapper().currentStudyStatusList(current,size,exeUserId,statusflag,name);
+       PageInfo<TrainingDto> page = new PageInfo(resultPage);
+       Page<TrainingDto> pagenew = new Page<TrainingDto>();
+       pagenew.setCurrent(current);
+       pagenew.setTotal(page.getTotal());
+       pagenew.setSize(size);
+       pagenew.setRecords(page.getList());
+
+
+      return pagenew;
+   }
+}
\ No newline at end of file

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

@@ -124,6 +124,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
     @Autowired
     PersonnelBusinessMapper personnelBusinessMapper;
 
+    @Autowired
+    WorkflowImpl workflow;
 
     @Autowired
     UserEmpowerMapper userEmpowerMapper;
@@ -468,6 +470,9 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
 
 
     private void submitExamine( UnitInfoDto regUnitInfo) {
+
+
+
         String taskId = null;
         Map<String, Object> objectMap = new HashMap<>(1);
         objectMap.put("describe", "经销商已上传信息");
@@ -475,34 +480,71 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         DealerReview dealerReview = new DealerReview();
         // 保存并审核
         try {
-            FeignClientResult<String> submit = idxFeginService.tokenSubmit(AMOS_STUDIO, AMOS_STUDIO_WEB,requestContext.getToken(),pageId, taskId, planId, null, "DEALER_EXAMINE", null, objectMap);
-
-
-            System.out.println("经销商注册发起"+AMOS_STUDIO+"@"+AMOS_STUDIO_WEB+"@"+requestContext.getToken());
-            if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
-                String code = submit.getResult();
-                // 插入记录表
-                dealerReview.setPlanInstanceId(planId);
-                dealerReview.setUnitInfoId(regUnitInfo.getSequenceNbr());
-                // 获取流程信息
-                FeignClientResult<JSONObject> record = idxFeginService.getRecordtoken(AMOS_STUDIO, AMOS_STUDIO_WEB,requestContext.getToken(),code);
-                if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
-                    JSONObject resultObj = record.getResult();
-                    String taskIdNew = String.valueOf(resultObj.get("taskId"));
-                    String processInstanceId = String.valueOf(resultObj.get("processInstanceId"));
-                    String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
-                    dealerReview.setTaskId(taskIdNew);
-                    dealerReview.setProcessInstanceId(processInstanceId);
-                    dealerReview.setFlowTaskId(flowTaskId);
-                    dealerReview.setNextProcessNode(DealerReviewEnum.经销商管理员审核.getCode());
-                }
-                dealerReviewService.saveDealerReview(dealerReview,true,false,regUnitInfo.getName(),"任务明细：经销商已上传信息");
-            }else{
-                throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
-            }
+
+            //发起工作流
+            // 调用工作流执行第一个节点
+            ProcessDto processDto = new ProcessDto();
+            processDto.setBusinessKey(String.valueOf(regUnitInfo.getSequenceNbr()));
+            processDto.setProcessDefinitionKey("JXS_SH");
+            StartProcessDto startProcessDto = new StartProcessDto();
+            List<ProcessDto> process=new ArrayList<>();
+            process.add(processDto);
+            startProcessDto.setProcess(process);
+            BasicGridAcceptance basicGridAcceptance=new BasicGridAcceptance();
+            workflow.startProcessnew(AMOS_STUDIO, AMOS_STUDIO_WEB,requestContext.getToken(),basicGridAcceptance, startProcessDto,requestContext.getUserId());
+            // 插入记录表
+            dealerReview.setPlanInstanceId(planId);
+            dealerReview.setUnitInfoId(regUnitInfo.getSequenceNbr());
+            dealerReview.setTaskId(basicGridAcceptance.getNextTaskId());
+            dealerReview.setProcessInstanceId(basicGridAcceptance.getInstanceId());
+            dealerReview.setFlowTaskId(basicGridAcceptance.getNextTaskId());
+            dealerReview.setNodeRole(basicGridAcceptance.getNextExecutorIds());
+            dealerReview.setNextProcessNode(DealerReviewEnum.经销商管理员审核.getCode());
+            dealerReviewService.saveDealerReview(dealerReview,true,false,regUnitInfo.getName(),"任务明细：经销商已上传信息");
+
         } catch (Exception e){
             throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
         }
+
+
+
+
+//
+//        String taskId = null;
+//        Map<String, Object> objectMap = new HashMap<>(1);
+//        objectMap.put("describe", "经销商已上传信息");
+//        // 第一步启动工作流
+//        DealerReview dealerReview = new DealerReview();
+//        // 保存并审核
+//        try {
+//            FeignClientResult<String> submit = idxFeginService.tokenSubmit(AMOS_STUDIO, AMOS_STUDIO_WEB,requestContext.getToken(),pageId, taskId, planId, null, "DEALER_EXAMINE", null, objectMap);
+//
+//
+//            System.out.println("发起"+AMOS_STUDIO+"@"+AMOS_STUDIO_WEB+"@"+requestContext.getToken());
+//            if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
+//                String code = submit.getResult();
+//                // 插入记录表
+//                dealerReview.setPlanInstanceId(planId);
+//                dealerReview.setUnitInfoId(regUnitInfo.getSequenceNbr());
+//                // 获取流程信息
+//                FeignClientResult<JSONObject> record = idxFeginService.getRecordtoken(AMOS_STUDIO, AMOS_STUDIO_WEB,requestContext.getToken(),code);
+//                if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
+//                    JSONObject resultObj = record.getResult();
+//                    String taskIdNew = String.valueOf(resultObj.get("taskId"));
+//                    String processInstanceId = String.valueOf(resultObj.get("processInstanceId"));
+//                    String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
+//                    dealerReview.setTaskId(taskIdNew);
+//                    dealerReview.setProcessInstanceId(processInstanceId);
+//                    dealerReview.setFlowTaskId(flowTaskId);
+//                    dealerReview.setNextProcessNode(DealerReviewEnum.经销商管理员审核.getCode());
+//                }
+//                dealerReviewService.saveDealerReview(dealerReview,true,false,regUnitInfo.getName(),"任务明细：经销商已上传信息");
+//            }else{
+//                throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
+//            }
+//        } catch (Exception e){
+//            throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
+//        }
     }
 
 
@@ -514,89 +556,99 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         // 2.更新审核记录表
         UnitInfo  unitInfo=null;
         try{
-        DealerReview  dealerReview= dealerReviewMapper.selectOne(new QueryWrapper<DealerReview>().eq("unit_info_id", stationId));
-          unitInfo= this.getById(stationId);
-        DealerReviewEnum nodeByCode = DealerReviewEnum.getNodeByCode(nodeCode);
-        String approvalStatue="";
-        if (DealerReviewEnum.经销商管理员审核.getCode().equals(nodeCode)) {
-            String result = String.valueOf(kv.get("approvalStatus"));
-            if (VERIFY_RESULT_NO.equals(result)) {
-                // 1. 更新经销商状态
-                unitInfo.setAuditStatus(3);
-                //发送断线
-                Boolean flag = true;
-                HashMap<String, String> params = new HashMap<>(3);
-                String meg= String.valueOf(kv.get("approveInfo"));
-                params.put("code","不通过");
-                params.put("mobile",unitInfo.getAdminPhone());
-                params.put("smsCode", smsTempCode);
-                approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核不通过";
-                FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params);
-            }else{
-                // 1. 更新经销商状态
-                unitInfo.setAuditStatus(2);
-                unitInfo.setBlacklist(0);
-
-
-            this.createCompanyAndUsernew(unitInfo);
-            PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
-            publicAgencyUser.setAmosUserId(unitInfo.getAdminUserId());
-            publicAgencyUser.setAmosUserName(unitInfo.getAdminLoginName());
-            publicAgencyUser.setRealName(unitInfo.getAdminLoginName());
-            publicAgencyUser.setRole("["+unitInfo.getRoleId()+"]");
-            publicAgencyUser.setEmergencyTelephone(unitInfo.getAdminPhone());
-            publicAgencyUser.setLockStatus("UNLOCK");
-            publicAgencyUserMapper.insert(publicAgencyUser);
-
-                List<String> lis=new ArrayList<>();
-                lis.add(unitInfo.getAmosCompanyCode());
-            LambdaQueryWrapper<RegionalCompanies> queryWrapper = new LambdaQueryWrapper<RegionalCompanies>();
-            queryWrapper.eq(RegionalCompanies::getUnitInfoId, unitInfo.getSequenceNbr());
-            List<RegionalCompanies> list=  regionalCompaniesMapper.selectList(queryWrapper);
-                for (RegionalCompanies companies : list) {
-                    companies.setUnitId(unitInfo.getAmosCompanySeq());
-                    lis.add(companies.getRegionalCompaniesCode());
+            DealerReview  dealerReview= dealerReviewMapper.selectOne(new QueryWrapper<DealerReview>().eq("unit_info_id", stationId));
+            unitInfo= this.getById(stationId);
+            DealerReviewEnum nodeByCode = DealerReviewEnum.getNodeByCode(nodeCode);
+            String approvalStatue="";
+            if (DealerReviewEnum.经销商管理员审核.getCode().equals(nodeCode)) {
+                String result = String.valueOf(kv.get("approvalStatus"));
+                if (VERIFY_RESULT_NO.equals(result)) {
+                    // 1. 更新经销商状态
+                    unitInfo.setAuditStatus(3);
+                    //发送断线
+                    Boolean flag = true;
+                    HashMap<String, String> params = new HashMap<>(3);
+                    String meg= String.valueOf(kv.get("approveInfo"));
+                    params.put("code","不通过");
+                    params.put("mobile",unitInfo.getAdminPhone());
+                    params.put("smsCode", smsTempCode);
+                    approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核不通过";
+                    FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params);
+                }else{
+                    // 1. 更新经销商状态
+                    unitInfo.setAuditStatus(2);
+                    unitInfo.setBlacklist(0);
+
+
+                    this.createCompanyAndUsernew(unitInfo);
+                    PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
+                    publicAgencyUser.setAmosUserId(unitInfo.getAdminUserId());
+                    publicAgencyUser.setAmosUserName(unitInfo.getAdminLoginName());
+                    publicAgencyUser.setRealName(unitInfo.getAdminLoginName());
+                    publicAgencyUser.setRole("["+unitInfo.getRoleId()+"]");
+                    publicAgencyUser.setEmergencyTelephone(unitInfo.getAdminPhone());
+                    publicAgencyUser.setLockStatus("UNLOCK");
+                    publicAgencyUserMapper.insert(publicAgencyUser);
+
+                    List<String> lis=new ArrayList<>();
+                    lis.add(unitInfo.getAmosCompanyCode());
+                    LambdaQueryWrapper<RegionalCompanies> queryWrapper = new LambdaQueryWrapper<RegionalCompanies>();
+                    queryWrapper.eq(RegionalCompanies::getUnitInfoId, unitInfo.getSequenceNbr());
+                    List<RegionalCompanies> list=  regionalCompaniesMapper.selectList(queryWrapper);
+                    for (RegionalCompanies companies : list) {
+                        companies.setUnitId(unitInfo.getAmosCompanySeq());
+                        lis.add(companies.getRegionalCompaniesCode());
+                    }
+                    regionalCompaniesService.saveOrUpdateBatch(list);
+
+                    PersonnelBusiness re=new PersonnelBusiness();
+                    re.setAmosDealerId(unitInfo.getAmosCompanySeq());
+                    re.setAmosUnitId(unitInfo.getAmosCompanySeq());
+                    re.setAmosUnitName(unitInfo.getName());
+                    re.setAmosUnitOrgCode(unitInfo.getAmosCompanyCode());
+                    re.setFoundationId(publicAgencyUser.getSequenceNbr());
+                    re.setUserType("2");
+                    personnelBusinessMapper.insert(re);
+
+                    //管理员绑定角色权限
+                    StdUserEmpower  stdUserEmpower=new StdUserEmpower();
+                    stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
+                    stdUserEmpower.setAmosOrgCode(lis);
+                    userEmpowerMapper.insert(stdUserEmpower);
+
+                    // Privilege.agencyUserClient.unlockUsers(unitInfo.getAdminUserId());
+                    approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核通过";
                 }
-             regionalCompaniesService.saveOrUpdateBatch(list);
-
-            PersonnelBusiness re=new PersonnelBusiness();
-            re.setAmosDealerId(unitInfo.getAmosCompanySeq());
-            re.setAmosUnitId(unitInfo.getAmosCompanySeq());
-            re.setAmosUnitName(unitInfo.getName());
-            re.setAmosUnitOrgCode(unitInfo.getAmosCompanyCode());
-            re.setFoundationId(publicAgencyUser.getSequenceNbr());
-            re.setUserType("2");
-            personnelBusinessMapper.insert(re);
-
-            //管理员绑定角色权限
-                StdUserEmpower  stdUserEmpower=new StdUserEmpower();
-                stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
-                stdUserEmpower.setAmosOrgCode(lis);
-                userEmpowerMapper.insert(stdUserEmpower);
-
-             // Privilege.agencyUserClient.unlockUsers(unitInfo.getAdminUserId());
-             approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核通过";
             }
-        }
-             // 2. 更新流程状态
-               String code = null;
+            // 2. 更新流程状态
+            String code = null;
             // 3. 工作流执行
-            FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, "DEALER_EXAMINE", null, kv);
-            if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
-                code = submit.getResult();
-                // 获取流程信息
-                FeignClientResult<JSONObject> record = idxFeginService.getRecord(code);
-                if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
-                    JSONObject resultObj = record.getResult();
-                    String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
-                    dealerReview.setFlowTaskId(flowTaskId);
-                }
-                dealerReviewService.saveDealerReview(dealerReview,false,true,unitInfo.getName(),approvalStatue);
-            }
+
+            //执行工作流
+            BasicGridAcceptance basicGridAcceptance=new BasicGridAcceptance();
+
+            StandardDto standardDto = new StandardDto();
+            standardDto.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):"");
+            standardDto.setResult(String.valueOf(kv.get("approvalStatus")));
+            standardDto.setTaskId(dealerReview.getFlowTaskId());
+            VariableDto variable = new VariableDto();
+            variable.setApprovalStatus(String.valueOf(kv.get("approvalStatus")));
+            variable.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):"");
+            variable.setOperationTime(String.valueOf(kv.get("approveDate")));
+            variable.setOperator(String.valueOf(kv.get("approveName")));
+            standardDto.setVariable(variable);
+            BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto, requestContext.getUserId());
+            dealerReview.setFlowTaskId(basicGridAcceptance.getNextTaskId());
+            dealerReviewService.saveDealerReview(dealerReview,false,true,unitInfo.getName(),approvalStatue);
+
+
+
+
+
             this.saveOrUpdate(unitInfo);
         }catch (Exception e){
 
-                        if (!ObjectUtils.isEmpty(unitInfo.getAmosCompanySeq())) {
+            if (!ObjectUtils.isEmpty(unitInfo.getAmosCompanySeq())) {
                 FeignClientResult<CompanyModel> feignClientResult = Privilege.companyClient
                         .seleteOne(unitInfo.getAmosCompanySeq());
                 if (feignClientResult != null) {
@@ -618,6 +670,117 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             throw new  BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
 
         }
+
+
+
+
+//        // 2.更新审核记录表
+//        UnitInfo  unitInfo=null;
+//        try{
+//        DealerReview  dealerReview= dealerReviewMapper.selectOne(new QueryWrapper<DealerReview>().eq("unit_info_id", stationId));
+//          unitInfo= this.getById(stationId);
+//        DealerReviewEnum nodeByCode = DealerReviewEnum.getNodeByCode(nodeCode);
+//        String approvalStatue="";
+//        if (DealerReviewEnum.经销商管理员审核.getCode().equals(nodeCode)) {
+//            String result = String.valueOf(kv.get("approvalStatus"));
+//            if (VERIFY_RESULT_NO.equals(result)) {
+//                // 1. 更新经销商状态
+//                unitInfo.setAuditStatus(3);
+//                //发送断线
+//                Boolean flag = true;
+//                HashMap<String, String> params = new HashMap<>(3);
+//                String meg= String.valueOf(kv.get("approveInfo"));
+//                params.put("code","不通过");
+//                params.put("mobile",unitInfo.getAdminPhone());
+//                params.put("smsCode", smsTempCode);
+//                approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核不通过";
+//                FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params);
+//            }else{
+//                // 1. 更新经销商状态
+//                unitInfo.setAuditStatus(2);
+//                unitInfo.setBlacklist(0);
+//
+//
+//            this.createCompanyAndUsernew(unitInfo);
+//            PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
+//            publicAgencyUser.setAmosUserId(unitInfo.getAdminUserId());
+//            publicAgencyUser.setAmosUserName(unitInfo.getAdminLoginName());
+//            publicAgencyUser.setRealName(unitInfo.getAdminLoginName());
+//            publicAgencyUser.setRole("["+unitInfo.getRoleId()+"]");
+//            publicAgencyUser.setEmergencyTelephone(unitInfo.getAdminPhone());
+//            publicAgencyUser.setLockStatus("UNLOCK");
+//            publicAgencyUserMapper.insert(publicAgencyUser);
+//
+//                List<String> lis=new ArrayList<>();
+//                lis.add(unitInfo.getAmosCompanyCode());
+//            LambdaQueryWrapper<RegionalCompanies> queryWrapper = new LambdaQueryWrapper<RegionalCompanies>();
+//            queryWrapper.eq(RegionalCompanies::getUnitInfoId, unitInfo.getSequenceNbr());
+//            List<RegionalCompanies> list=  regionalCompaniesMapper.selectList(queryWrapper);
+//                for (RegionalCompanies companies : list) {
+//                    companies.setUnitId(unitInfo.getAmosCompanySeq());
+//                    lis.add(companies.getRegionalCompaniesCode());
+//                }
+//             regionalCompaniesService.saveOrUpdateBatch(list);
+//
+//            PersonnelBusiness re=new PersonnelBusiness();
+//            re.setAmosDealerId(unitInfo.getAmosCompanySeq());
+//            re.setAmosUnitId(unitInfo.getAmosCompanySeq());
+//            re.setAmosUnitName(unitInfo.getName());
+//            re.setAmosUnitOrgCode(unitInfo.getAmosCompanyCode());
+//            re.setFoundationId(publicAgencyUser.getSequenceNbr());
+//            re.setUserType("2");
+//            personnelBusinessMapper.insert(re);
+//
+//            //管理员绑定角色权限
+//                StdUserEmpower  stdUserEmpower=new StdUserEmpower();
+//                stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
+//                stdUserEmpower.setAmosOrgCode(lis);
+//                userEmpowerMapper.insert(stdUserEmpower);
+//
+//             // Privilege.agencyUserClient.unlockUsers(unitInfo.getAdminUserId());
+//             approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核通过";
+//            }
+//        }
+//             // 2. 更新流程状态
+//               String code = null;
+//            // 3. 工作流执行
+//            FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, "DEALER_EXAMINE", null, kv);
+//            if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
+//                code = submit.getResult();
+//                // 获取流程信息
+//                FeignClientResult<JSONObject> record = idxFeginService.getRecord(code);
+//                if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
+//                    JSONObject resultObj = record.getResult();
+//                    String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
+//                    dealerReview.setFlowTaskId(flowTaskId);
+//                }
+//                dealerReviewService.saveDealerReview(dealerReview,false,true,unitInfo.getName(),approvalStatue);
+//            }
+//            this.saveOrUpdate(unitInfo);
+//        }catch (Exception e){
+//
+//                        if (!ObjectUtils.isEmpty(unitInfo.getAmosCompanySeq())) {
+//                FeignClientResult<CompanyModel> feignClientResult = Privilege.companyClient
+//                        .seleteOne(unitInfo.getAmosCompanySeq());
+//                if (feignClientResult != null) {
+//                    Privilege.companyClient.deleteCompany(unitInfo.getAmosCompanySeq().toString());
+//                }
+//            }
+//            // 失败后回滚：删除已经创建的管理员账号
+//            if (StringUtils.isNotEmpty(unitInfo.getAdminUserId())) {
+//                FeignClientResult<AgencyUserModel> feignClientResult = Privilege.agencyUserClient
+//                        .queryByUserId(unitInfo.getAdminUserId());
+//                if (feignClientResult != null) {
+//                    Privilege.agencyUserClient.multDeleteUser(unitInfo.getAdminUserId());
+//                }
+//            }
+//
+//
+//
+//
+//            throw new  BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
+//
+//        }
         return code;
     }
 

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

@@ -524,6 +524,21 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
             powerStationEngineeringInfo.setConstructionRegionManager(workOrder.getConstructionRegionManager());
             powerStationEngineeringInfo.setConstructionRegionManagerPhone(workOrder.getConstructionRegionManagerPhone());
         }
+
+
+
+        //施工自审
+        LambdaQueryWrapper<ConstructionRecords> up5=new LambdaQueryWrapper();
+        up5.eq(ConstructionRecords::getWorkOrderId,workOrderId);
+        up5.eq(ConstructionRecords::getWorkOrderPowerStationId,workOrderPowerStationId);
+        up5.orderByAsc(ConstructionRecords::getRecDate);
+        List<ConstructionRecords>   li=constructionRecordsMapper.selectList(up5);
+        ConstructionRecords data=new ConstructionRecords();
+        data.setConstructionRecordsList(li);
+        surveyInfoAllDto.setConstructionRecords(data);
+
+
+
         //并网信息
         LambdaQueryWrapper<HygfOnGrid> up4=new LambdaQueryWrapper();
         up4.eq(HygfOnGrid::getWorkOrderId,workOrderId);
@@ -679,7 +694,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
         LambdaQueryWrapper<ConstructionRecords> up5=new LambdaQueryWrapper();
         up5.eq(ConstructionRecords::getWorkOrderId,workOrderId);
         up5.eq(ConstructionRecords::getWorkOrderPowerStationId,workOrderPowerStationId);
-        up5.orderByDesc(ConstructionRecords::getRecDate);
+        up5.orderByAsc(ConstructionRecords::getRecDate);
         List<ConstructionRecords>   li=constructionRecordsMapper.selectList(up5);
         ConstructionRecords data=new ConstructionRecords();
         data.setConstructionRecordsList(li);

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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 import java.util.List;
 
@@ -36,6 +37,18 @@ public class WorkflowImpl {
          basicGridAcceptance= this.getBasicGridAcceptance(basicGridAcceptance,json,userid);
         return basicGridAcceptance;
     }
+    public BasicGridAcceptance startProcessnew(
+            String appKey,
+            String product,
+            String token,
+            BasicGridAcceptance basicGridAcceptance,StartProcessDto startProcessDto,String userid){
+        FeignClientResult<List<ProcessTaskDTO>> json=   workflowFeignClient.startProcessnew( appKey,
+                product,
+                token,
+                startProcessDto);
+        basicGridAcceptance= this.getBasicGridAcceptance(basicGridAcceptance,json,userid);
+        return basicGridAcceptance;
+    }
 
     /**
      *

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

 ## DB properties:
 spring.datasource.dynamic.primary= mysql-service
 spring.datasource.mysql-service.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.mysql-service.jdbc-url=jdbc:mysql://172.16.10.220:3306/amos_project_2023?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.mysql-service.jdbc-url=jdbc:mysql://47.92.234.253:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.mysql-service.username=root
 spring.datasource.mysql-service.password=Yeejoin@2020
 spring.datasource.mysql-service.type=com.zaxxer.hikari.HikariDataSource
@@ -23,7 +23,7 @@ spring.datasource.mysql-service.connection-timeout: 30000
 
 
 spring.datasource.tdengine-service.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
-spring.datasource.tdengine-service.jdbc-url=jdbc:TAOS-RS://139.9.170.47:6041/house_pv_data?user=root&password=taosdata&timezone=GMT+8
+spring.datasource.tdengine-service.jdbc-url=jdbc:TAOS-RS://47.92.234.253:6041/house_pv_data?user=root&password=taosdata&timezone=GMT+8
 spring.datasource.tdengine-service.username=root
 spring.datasource.tdengine-service.password=taosdata
 spring.datasource.tdengine-service.type=com.zaxxer.hikari.HikariDataSource
@@ -50,11 +50,11 @@ spring.datasource.tdengine-service.connection-test-query: SELECT 1
 
 
 ## eureka properties:
-eureka.instance.hostname=172.16.10.220
+eureka.instance.hostname=47.92.234.253
 eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
 ## redis properties:
 spring.redis.database=1
-spring.redis.host=172.16.10.220
+spring.redis.host=47.92.234.253
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
@@ -90,13 +90,13 @@ lettuce.timeout=10000
 
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.10.220:1883
+emqx.broker=tcp://47.92.234.253:1883
 emqx.user-name=admin
 emqx.password=public
 emqx.max-inflight=1000
 
 
-spring.influx.url=http://39.98.246.31:8086
+spring.influx.url=http://47.92.234.253:8086
 spring.influx.password=Yeejoin@2020
 spring.influx.user=root
 spring.influx.database=iot_platform
@@ -125,7 +125,7 @@ amos.secret.key=qaz
 # if your service can't be access ,you can use this setting , you need change ip as your.
 #eureka.instance.prefer-ip-address=true
 #eureka.instance.ip-address=172.16.3.122
-spring.activemq.broker-url=tcp://172.16.10.220:61616
+spring.activemq.broker-url=tcp://47.92.234.253:61616
 spring.activemq.user=admin
 spring.activemq.password=admin
 spring.jms.pub-sub-domain=false
@@ -158,6 +158,7 @@ unitInfo.station.examine.planId=51776087-a9cf-4a87-9a03-24fd24a8cf45
 
 hygf.sms.tempCodeJXS=SMS_HYGF_0002
 
+#工程角色id
 hygf.role.gc.roleSeq=1702550832882413570
 
 # 锟矫伙拷锟斤拷userGroupId
@@ -218,3 +219,8 @@ dealer.engineering=1702512052154687489
 
 #锟斤拷时锟斤拷锟斤拷锟饺★拷锟斤拷锟斤拷锟较?
 cheduled.crons=0 10 0 * * ?
+
+
+dealer.appcode.manage=studio_normalapp_5155413,studio_normalapp_5133538
+dealer.appcode.role=1767363928842571777
+dealer.amosDealerId=1767820997374775298
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application.properties

-spring.application.name=AMOS-HYGF
+spring.application.name=AMOS-HYGF-CAOTAO
 server.servlet.context-path=/hygf
 server.port=33330
 server.uri-encoding=UTF-8

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/application-dev1.properties

+## DB properties:
+## db1-production database
+spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
+spring.db1.datasource.url=jdbc:mysql://10.20.1.157:3306/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db1.datasource.username=root
+spring.db1.datasource.password=Yeejoin@2020
+spring.db1.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
+## db2-sync_data
+spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
+spring.db2.datasource.url=jdbc:mysql://10.20.1.157:3306/amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db2.datasource.username=root
+spring.db2.datasource.password=Yeejoin@2020
+spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
+
+## db5-sync_data
+spring.db5.datasource.type: com.alibaba.druid.pool.DruidDataSource
+spring.db5.datasource.url=jdbc:mysql://10.20.1.157:3306/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db5.datasource.username=root
+spring.db5.datasource.password=Yeejoin@2020
+spring.db5.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
+## amos-project
+spring.db6.datasource.type: com.alibaba.druid.pool.DruidDataSource
+spring.db6.datasource.url=jdbc:mysql://10.20.1.157:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db6.datasource.username=root
+spring.db6.datasource.password=Yeejoin@2020
+spring.db6.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
+
+## eureka properties:
+eureka.instance.hostname=10.20.1.160
+eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
+## redis properties:
+spring.redis.database=1
+spring.redis.host=10.20.1.210
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+
+openHealth=false
+spring.cache.type=GENERIC
+j2cache.open-spring-cache=true
+j2cache.cache-clean-mode=passive
+j2cache.allow-null-values=true
+j2cache.redis-client=lettuce
+j2cache.l2-cache-open=true
+j2cache.broadcast=net.oschina.j2cache.cache.support.redis.SpringRedisPubSubPolicy
+j2cache.L1.provider_class=caffeine
+j2cache.L2.provider_class=net.oschina.j2cache.cache.support.redis.SpringRedisProvider
+j2cache.L2.config_section=lettuce
+j2cache.sync_ttl_to_redis=true
+j2cache.default_cache_null_object=false
+j2cache.serialization=fst
+caffeine.properties=/caffeine.properties
+lettuce.mode=single
+lettuce.namespace=
+lettuce.storage=generic
+lettuce.channel=j2cache
+lettuce.scheme=redis
+lettuce.hosts=${spring.redis.host}:${spring.redis.port}
+lettuce.password=${spring.redis.password}
+lettuce.database=${spring.redis.database}
+lettuce.sentinelMasterId=
+lettuce.maxTotal=100
+lettuce.maxIdle=10
+lettuce.minIdle=10
+lettuce.timeout=10000
+
+
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://10.20.1.210:2883
+emqx.user-name=admin
+emqx.password=public
+mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt
+mqtt.client.product.id=mqtt
+mqtt.topic=topic_mqtt
+spring.mqtt.completionTimeout=3000
+emqx.max-inflight=1000
+
+
+tdengine-server:
+driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+jdbc-url: jdbc:TAOS-RS://10.20.0.203:6041/iot_data_1?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+username: root
+password: taosdata
+
+
+#spring.db3.datasource.type: com.alibaba.druid.pool.DruidDataSource
+spring.db3.datasource.url=jdbc:TAOS-RS://10.20.0.203:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.db3.datasource.username=root
+spring.db3.datasource.password=taosdata
+spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+
+
+# ����ר��td���ݿ� analyse_data
+#spring.db4.datasource.type: com.alibaba.druid.pool.DruidDataSource
+spring.db4.datasource.url=jdbc:TAOS-RS://10.20.0.203:6041/analysis_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.db4.datasource.username=root
+spring.db4.datasource.password=taosdata
+spring.db4.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+
+
+## influxDB
+#spring.influx.url= http://172.16.3.155:18186
+#spring.influx.password=Yeejoin@2020
+#spring.influx.user=root
+#spring.influx.database=iot_platform
+#spring.influx.retention_policy=default
+#spring.influx.retention_policy_time=30d
+#spring.influx.actions=10000
+#spring.influx.bufferLimit=20000
+
+## influxDB
+#spring.influx.url= http://139.9.171.247:8086
+#spring.influx.password=Yeejoin@2023
+#spring.influx.user=admin
+#spring.influx.database=iot_platform
+#spring.influx.retention_policy=default
+#spring.influx.retention_policy_time=30d
+#spring.influx.actions=10000
+#spring.influx.bufferLimit=20000
+
+
+spring.influx.url=http://139.9.173.44:8086
+spring.influx.password=Yeejoin@2020
+spring.influx.user=root
+spring.influx.database=iot_platform
+spring.influx.retention_policy=default
+spring.influx.retention_policy_time=30d
+spring.influx.actions=10000
+spring.influx.bufferLimit=20000
+
+knife4j.production=false
+knife4j.enable=true
+knife4j.basic.enable=true
+knife4j.basic.username=admin
+knife4j.basic.password=a1234560
+
+management.security.enabled=true
+spring.security.user.name=admin
+spring.security.user.password=a1234560
+
+fire-rescue=123
+
+mybatis-plus.global-config.db-config.update-strategy=ignored
+
+# user-amos setting : This value is the secretkey for person manage moudle accout password encryption.please don't change it!!!
+amos.secret.key=qaz
+# if your service can't be access ,you can use this setting , you need change ip as your.
+#eureka.instance.prefer-ip-address=true
+#eureka.instance.ip-address=172.16.3.122
+
+
+spring.activemq.broker-url=tcp://10.20.1.210:61616
+spring.activemq.user=admin
+spring.activemq.password=admin
+spring.jms.pub-sub-domain=false
+myqueue=amos.privilege.v1.JXIOP.AQSC_FDGL.userBusiness
+
+# ?????????
+fan.statuts.stattuspath=upload/jxiop/device_status
+
+pictureUrl=upload/jxiop/syz/
+
+
+
+
+
+#kafka
+spring.kafka.bootstrap-servers=10.20.0.223:9092,10.20.0.133:9200
+spring.kafka.producer.retries=1
+spring.kafka.producer.bootstrap-servers=10.20.0.223:9092,10.20.0.133:9200
+spring.kafka.producer.batch-size=16384
+spring.kafka.producer.buffer-memory=33554432
+spring.kafka.producer.acks=1
+spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
+spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
+spring.kafka.consumer.group-id=consumerGroup
+spring.kafka.consumer.bootstrap-servers=10.20.0.223:9092,10.20.0.133:9200
+spring.kafka.consumer.enable-auto-commit=false
+spring.kafka.consumer.auto-offset-reset=earliest
+spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
+spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer
+spring.kafka.listener.ack-mode=manual_immediate
+spring.kafka.listener.type=batch
+#һ����ȡ���� && �߳�����
+spring.kafka.consumer.max-poll-records=30
+#spring.kafka.consumer.fetch-max-wait= 10000
+
+
+#��ǰʱ����ǰƫ������    ����ʷƫ������
+last.month.num = 12
+
+#����� �㷨����
+base.url.XGX=http://139.9.171.247:8052/intelligent-analysis/correlation
+#�������� �㷨���õ�ַ
+base.url.GKHF=http://139.9.171.247:8052/intelligent-analysis/working-condition-division
+#����� �㷨����
+base.url.ZXZ=http://139.9.171.247:8052/intelligent-analysis/central-value
+#ָ���������㷨����
+base.url.zsfx:http://139.9.171.247:8052/intelligent-analysis/index-analysis
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/logback-dev1.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log" />
+    <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/ccs.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>7</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <MaxFileSize>30mb</MaxFileSize>
+        </triggeringPolicy>
+    </appender>
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="java.sql.Connection" level="DEBUG"/>
+    <logger name="java.sql.Statement" level="DEBUG"/>
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+    <logger name="com.baomidou.mybatisplus" level="DEBUG"/>
+    <logger name="org.springframework" level="DEBUG"/>
+    <logger name="org.typroject" level="DEBUG"/>
+    <logger name="com.yeejoin" level="DEBUG"/>
+    <!-- 日志输出级别 -->
+    <root level="INFO">
+        <appender-ref ref="FILE" />
+        <appender-ref ref="STDOUT" />
+    </root>
+
+</configuration>

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IPermissionService.java

@@ -2,9 +2,12 @@ package com.yeejoin.amos.boot.module.jxiop.api.service;
 
 
 import java.util.List;
+import java.util.Map;
 
 public interface IPermissionService {
     List<String> getCurrentUserPermissions();
     List<String> getCurrentUserProjectOrgCodes();
     List<String> getCurrentUserAmosOrgCodes();
+
+    Map<String, String> judgeUserIsStation();
 }

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

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.module.jxiop.api.service.IPermissionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.ObjectUtils;
@@ -51,6 +52,8 @@ public class PrivilegeController extends BaseController {
 	private RedisUtils redisUtils;
 	@Autowired
 	private UserEmpowerMapper userEmpowerMapper;
+	@Autowired
+	IPermissionService iPermissionService;
 	
 	@Value("${yth.qg.id}")
 	private Long qgCompanyId;
@@ -238,4 +241,12 @@ public class PrivilegeController extends BaseController {
 		return ResponseHelper.buildResponse(list);
 	}
 
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/judgeUserIsStation")
+	@ApiOperation(httpMethod = "GET", value = "查询当前人是否为场站层级", notes = "查询当前人是否为场站层级")
+	public ResponseModel<Map<String,String>> judgeUserIsStation() {
+	return 	ResponseHelper.buildResponse(iPermissionService.judgeUserIsStation());
+	}
+
 }

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

@@ -17,6 +17,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -123,4 +124,58 @@ public class IPermissionServiceImpl implements IPermissionService {
 					: new ArrayList<>();
 		}
 	}
+    public Map<String, String> judgeUserIsStation() {
+
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        String userId = reginParams.getUserModel().getUserId();
+        StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId));
+        Map<String, String> map = new HashMap<>();
+        if (ObjectUtils.isEmpty(stdUserEmpower)) {
+            map.put("isStation","false");
+        } else {
+            String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
+            Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
+            String companyLevel = companyInfo.get("level");
+            if (companyLevel.equals("categroy_leve2")) {
+                map.put("isStation","false");
+            }
+            if (companyLevel.equals("area")) {
+                map.put("isStation","false");
+
+            }
+            if (companyLevel.equals("station")) {
+                map.put("isStation","false");
+              }
+        }
+        return map;
+    }
+
+//    @Override
+//    public List<String> getCurrentUserProjectOrgCodes() {
+//        List<String> result = new ArrayList<>();
+//        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+//        String userId = reginParams.getUserModel().getUserId();
+//        StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
+//        if (ObjectUtils.isEmpty(stdUserEmpower)) {
+//            return null;
+//        } else {
+//            String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
+//            Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
+//            String companyLevel = companyInfo.get("level");
+//            if (companyLevel.equals("categroy_leve2")) {
+//                return null;
+//            }
+//            if (companyLevel.equals("area")) {
+//                List<StationBasic> stationBasics = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
+//                result = stationBasics.stream().map(StationBasic::getProjectOrgCode).collect(Collectors.toList());
+//                return result;
+//            }
+//            if (companyLevel.equals("station")) {
+//                StationBasic stationBasic = stationBasicMapper.selectOne(new QueryWrapper<StationBasic>().eq("project_org_code", permissionOrgCode));
+//                result.add(stationBasic.getProjectOrgCode());
+//                return result;
+//            }
+//        }
+//        return result;
+//    }
 }