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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java

@@ -26,29 +26,30 @@ public class MyBatisPlusCodeGenerator {
     /**
      * 项目名称缩写
      */
-    static String projectShortName = "tzs";
+    static String projectShortName = "jxiop";
+    static String projectShortName1 = "hygf";
 
     /**
      * 项目api目录
      */
-    static String apiAddress = "/amos-boot-module/amos-boot-module-api/" + "amos-boot-module-" + projectShortName +
+    static String apiAddress = "/amos-boot-system-" + projectShortName + "/amos-boot-module-" + projectShortName1 +
             "-api/";
 
     /**
      * 项目biz目录
      */
-    static String bizAddress = "/amos-boot-module/amos-boot-module-biz/" + "amos-boot-module-" + projectShortName +
+    static String bizAddress = "/amos-boot-system-" + projectShortName + "/amos-boot-module-" + projectShortName1 +
             "-biz/";
 
     /**
      * 项目api路径
      */
-    static String apiPath = apiAddress + "src/main/java/com/yeejoin/amos/boot/module/" + projectShortName + "/api";
+    static String apiPath = apiAddress + "src/main/java/com/yeejoin/amos/boot/module/" + projectShortName1 + "/api";
 
     /**
      * 项目biz路径
      */
-    static String bizPath = bizAddress + "src/main/java/com/yeejoin/amos/boot/module/" + projectShortName + "/biz";
+    static String bizPath = bizAddress + "src/main/java/com/yeejoin/amos/boot/module/" + projectShortName1 + "/biz";
 
     /**
      * 接口及实体等代码生成路径
@@ -102,12 +103,12 @@ public class MyBatisPlusCodeGenerator {
         gc.setActiveRecord(false);
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://172.16.6.60:3306/amos-tzs-biz?serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://47.92.234.253:3306/amos_project?serverTimezone=GMT%2B8");
         // dsc.setSchemaName("public");
 //        dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("root_123");
+        dsc.setPassword("Yeejoin@2020");
 
         dsc.setTypeConvert(new ITypeConvert() {
             @Override
@@ -292,7 +293,8 @@ public class MyBatisPlusCodeGenerator {
         strategy.setControllerMappingHyphenStyle(true);
         strategy.setTablePrefix();
         //去除表名前缀
-        strategy.setTablePrefix("t_", "tb_", "sys_", "other_", "rpm_", "s_", "tcb_", "cb_", "tz_", "jc_", "jcb_");
+        strategy.setTablePrefix("tz_" + projectShortName1 + "_", "t_", "tb_", "sys_", "other_", "rpm_", "s_", "tcb_",
+                "cb_", "tz_", "jc_", "jcb_", "flc_");
         // 设置父级Controller
         strategy.setSuperControllerClass("com.yeejoin.amos.boot.biz.common.controller.BaseController");
         autoGenerator.setStrategy(strategy);

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

@@ -72,4 +72,15 @@ public enum AcceptanceStatusEnum {
         }
         return acceptanceStatusEnum.getCode();
     }
+
+    public static AcceptanceStatusEnum getAcceptanceStatusByKey(String Key, String state) {
+        AcceptanceStatusEnum acceptanceStatusEnum = null;
+        for (AcceptanceStatusEnum type : AcceptanceStatusEnum.values()) {
+            if (type.getKey().contains(Key) && type.getState().equals(state)) {
+                acceptanceStatusEnum = type;
+                break;
+            }
+        }
+        return acceptanceStatusEnum;
+    }
 }

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

@@ -15,6 +15,7 @@ public enum ArrivalStateeEnum {
     待收货("待收货", "待收货"),
 
     已收货("已收货", "已收货"),
+    补货申请("补货申请", "补货申请"),
 
     已作废("已作废", "已作废"),
 
@@ -30,7 +31,8 @@ public enum ArrivalStateeEnum {
     并网完成("并网完成", "并网完成"),
     线上验收("线上验收", "线上验收"),
     线下验收("线下验收", "线下验收"),
-    验收完成("验收完成", "验收完成");
+    验收完成("验收完成", "验收完成"),
+    待发货("待发货", "待发货");
 
 
 

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

@@ -15,6 +15,15 @@ public enum DeliveryStateeEnum {
 
     待发货("待发货", "待发货"),
 
+    暂存发货("暂存发货", "暂存发货"),
+    待提交("待提交", "待提交"),
+    待确认("待确认", "待确认"),
+    待补货("待补货", "待补货"),
+
+    待审核("待审核", "待审核"),
+
+    已完成("已完成", "已完成"),
+
     已发货("已发货", "已发货"),
 
     已作废("已作废", "已作废");

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfPreparationMoneyAuditingDto.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-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="HygfPreparationMoneyAuditingDto", description="投融审核表")
+public class HygfPreparationMoneyAuditingDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "工作流实例ID")
+    private String instanceId;
+
+    @ApiModelProperty(value = "下一个节点角色权限id")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
+
+    @ApiModelProperty(value = "流程下一节点id")
+    private String nextTaskId;
+
+    @ApiModelProperty(value = "下一节点可执行人逗号分割")
+    private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "工作流发起人id")
+    private String createUserId;
+
+    @ApiModelProperty(value = "下个节点名称")
+    private String nextNodeName;
+
+    @ApiModelProperty(value = "下个节点key")
+    private String nextNodeKey;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "农户id")
+    private Long preparationMoneyId;
+
+    @ApiModelProperty(value = " 待执行节点小程序路由")
+    private String nodeRouting;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+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-07-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="HygfReplenishmentDto", description="")
+public class HygfReplenishmentDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "发货单id")
+    private Long preparationMoneyId;
+
+    @ApiModelProperty(value = "补货描述")
+    private String comment;
+
+    @ApiModelProperty(value = "补货文件")
+    private String file;
+
+}

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

@@ -29,4 +29,8 @@ public class UserDataJBDto {
     private String nowAddress;
     private String politicalOutlook;
     private String nativePlace;
+    /**
+     * 是否有业务操作
+     */
+    private Boolean hasOperationRecords;
     }

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

@@ -16,4 +16,8 @@ public class UserDataZHDto {
     private String  password;
     private String  rePassword;
     private List<Long> role;
+    /**
+     * 是否有业务操作
+     */
+    private Boolean hasOperationRecords;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfPreparationMoneyAuditing.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-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_preparation_money_auditing")
+public class HygfPreparationMoneyAuditing extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工作流实例ID
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 下一个节点角色权限id
+     */
+	@TableField("next_executor_ids")
+    private String nextExecutorIds;
+
+    /**
+     * 任务发起人id
+     */
+	@TableField("promoter")
+    private String promoter;
+
+    /**
+     * 流程下一节点id
+     */
+	@TableField("next_task_id")
+    private String nextTaskId;
+
+    /**
+     * 下一节点可执行人逗号分割
+     */
+	@TableField("next_execute_user_ids")
+    private String nextExecuteUserIds;
+
+    /**
+     * 工作流发起人id
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 下个节点名称
+     */
+	@TableField("next_node_name")
+    private String nextNodeName;
+
+    /**
+     * 下个节点key
+     */
+	@TableField("next_node_key")
+    private String nextNodeKey;
+
+    /**
+     * 状态
+     */
+	@TableField("status")
+    private String status;
+
+    /**
+     * 农户id
+     */
+	@TableField("preparation_money_id")
+    private Long preparationMoneyId;
+
+    /**
+     *  待执行节点小程序路由
+     */
+	@TableField("node_routing")
+    private String nodeRouting;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfReplenishment.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.Value;
+import lombok.experimental.Accessors;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-07-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value="hygf_replenishment",autoResultMap = true)
+public class HygfReplenishment extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 发货单id
+     */
+	@TableField("preparation_money_id")
+    private Long preparationMoneyId;
+
+    /**
+     * 补货描述
+     */
+	@TableField("comment")
+    private String comment;
+
+    /**
+     * 补货文件
+     */
+	@TableField(value = "file" , typeHandler = FastjsonTypeHandler.class)
+    private List<Map> file;
+
+}

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

@@ -192,6 +192,12 @@ public class PeasantHousehold extends BaseEntity {
     /**
      *  已发货，已收货，
      */
+    @TableField("preparation_money_state")
+    private String preparationMoneyState;
+
+    /**
+     *  备货状态
+     */
     @TableField("construction_state")
     private String constructionState;
 

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

@@ -4,6 +4,7 @@ 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 com.yeejoin.amos.boot.module.hygf.api.dto.HygfReplenishmentDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -149,6 +150,14 @@ public class PreparationMoney extends BaseEntity {
     @TableField(exist = false)
     private List<PreparationMoneyLog> preparationMoneyLog;  //发货单流水
 
+    @TableField(exist = false)
+    private List<HygfReplenishment> files;
+
 
+    @TableField(exist = false)
+    private String instanceId;  //发货单流水
+    //订单状态
+    @TableField("order_status")
+    private String orderStatus;
 
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfPreparationMoneyAuditing;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 投融审核表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-06-18
+ */
+public interface HygfPreparationMoneyAuditingMapper extends BaseMapper<HygfPreparationMoneyAuditing> {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.dto.HygfReplenishmentDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfReplenishment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-07-02
+ */
+public interface HygfReplenishmentMapper extends BaseMapper<HygfReplenishment> {
+
+    List<HygfReplenishmentDto> selectData(Long sequenceNbr);
+}

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

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,7 +29,7 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
 
     );
     @UserEmpower(field={},dealerField={"developer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","eq"} ,relationship="and")
-    List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified);
+    List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified,String preparationMoneyState);
 
 
     List<Map<String,Object>> selectUserIsHouse(String telephone);

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

@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 发货单 Mapper 接口
@@ -28,4 +29,11 @@ public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
     @UserEmpower(field ={"regional_companies_code"} ,dealerField={"amos_unit_org_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     List<PreparationMoney> selectPageList(@Param(value = "dto") PreparationDto preparationDto);
 
+    @UserEmpower(field ={"regional_companies_code"} ,dealerField={"amos_unit_org_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<Map<String,Object>> preparationStation (@Param(value = "preparationMoneyState")  String preparationMoneyState,
+                                                 @Param(value = "ownersName") String ownersName,
+                                                 @Param(value = "regionalCompaniesSeq") String regionalCompaniesSeq,
+                                                 @Param(value = "developerId") String developerId,
+                                                 @Param(value = "state") String state);
+
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 投融审核表接口类
+ *
+ * @author system_generator
+ * @date 2024-06-18
+ */
+public interface IHygfPreparationMoneyAuditingService {
+
+}

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

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

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

+package com.yeejoin.amos.boot.module.hygf.api.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.BooleanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.Cursor;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ScanOptions;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * spring redis 工具类
+ * <p>
+ * ProjectName: qms
+ * PackageName: com.yeejoin.amos.qms.api.spc.utils
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/4/19 10:15
+ */
+@Component
+@Slf4j
+public class RedisLockUtil {
+
+    @Autowired
+    public RedisTemplate redisTemplate;
+
+    /**
+     * 加锁，阻塞
+     *
+     * @param key        锁主键
+     * @param value      缓存值
+     * @param expireTime 锁有效时间，-1永久存储，单位秒
+     * @param waitTime   获取锁阻塞等待时间，单位秒
+     * @return result
+     */
+    public Boolean tryLock(String key, String value, long expireTime, long waitTime) {
+        long start = System.currentTimeMillis();
+        // 默认10秒
+        waitTime = (waitTime < 0 ? 10 : waitTime) * 1000;
+        expireTime = expireTime < 0 ? -1 : expireTime;
+        for (; ; ) {
+            //SET命令返回OK ，则证明获取锁成功
+            Boolean ret = redisTemplate.opsForValue().setIfAbsent(key, value, expireTime, TimeUnit.SECONDS);
+            if (BooleanUtils.isTrue(ret)) {
+                return true;
+            }
+            //否则循环等待，在等待超时时间内仍未获取到锁，则获取失败
+            long end = System.currentTimeMillis() - start;
+            if (end >= waitTime) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * 删除单个对象
+     *
+     * @param key
+     */
+    public boolean releaseLock(final String key) {
+        return redisTemplate.delete(key);
+    }
+
+    /**
+     * 替代keys
+     *
+     * @param pattern key模糊
+     */
+    public Set<String> scan(final String pattern) {
+        return (Set<String>) redisTemplate.execute((RedisCallback<Set<String>>) connection -> {
+            Set<String> keys = new HashSet<>();
+            try (Cursor<byte[]> cursor = connection.scan(new ScanOptions.ScanOptionsBuilder().match(pattern).count(1000).build())) {
+                while (cursor.hasNext()) {
+                    keys.add(new String(cursor.next(), StandardCharsets.UTF_8));
+                }
+            } catch (Exception e) {
+                log.error(e.getMessage());
+            }
+            return keys;
+        });
+    }
+}

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

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HygfReplenishmentMapper.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.HygfReplenishmentMapper">
+
+    <select id="selectData" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HygfReplenishmentDto">
+    select * from hygf_replenishment where  preparation_money_id = #{sequenceNbr}
+
+
+    </select>
+</mapper>

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

@@ -10,14 +10,12 @@ hygf_household_contract.`status`='双方已签署'
 and hygf_peasant_household.developer_id=#{developerId}
 and hygf_peasant_household.regional_companies_seq=#{regionalCompaniesSeq}
 and hygf_peasant_household.survey_or_not=3 and  hygf_peasant_household.sequence_nbr not in
-(select hygf_document_station.station_id  from hygf_preparation_money LEFT JOIN hygf_document_station
-on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nbr  where hygf_preparation_money.delivery_state !='已作废'
+(select hygf_document_station.station_id  from hygf_preparation_money RIGHT JOIN hygf_document_station
+on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nbr  where
+  hygf_document_station.station_id is not null
     <if test="ids!=null and ids !=''">
         and hygf_document_station.preparation_money_id !=#{ids}
-    </if>
-
-and hygf_document_station.station_id is not null
-)
+    </if>)
     <if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
         and hygf_peasant_household.peasant_household_no like concat(concat("%",#{peasantHouseholdNo}),"%")
     </if>
@@ -58,13 +56,19 @@ and hygf_document_station.station_id is not null
         <if test="ownersName!=null and ownersName !=''">
             and owners_name like concat ('%',#{ownersName},'%')
         </if>
+        <if test="preparationMoneyState!=null and preparationMoneyState !='' and preparationMoneyState == '0' ">
+            and preparation_money_state in ('待发货','待补货','暂存发货')
+        </if>
+        <if test="preparationMoneyState!=null and preparationMoneyState !='' and preparationMoneyState == '1' ">
+            and preparation_money_state not in  ('待发货','待补货','暂存发货')
+        </if>
         <if test="developerId!=null and developerId !=''">
             and developer_id = #{developerId}
         </if>
         <if test="developerCode!=null and developerCode !=''">
             and developer_code = #{developerCode}
         </if>
-        ORDER BY rec_date DESC
+        ORDER BY creation_time DESC
     </select>
     <select id="selectUserIsHouse" resultType="java.util.Map">
         SELECT

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

@@ -13,7 +13,7 @@
     hygf_peasant_household.project_address_detail,
     b.stamp_status,
     b.status
-    from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id,stamp_status,status from  hygf_household_contract where   hygf_household_contract.status !='已作废'
+    from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id,stamp_status,status from  hygf_household_contract
     ) b    on b.peasant_household_id=hygf_power_station.peasant_household_id
     LEFT JOIN hygf_peasant_household on hygf_peasant_household.sequence_nbr=hygf_power_station.peasant_household_id
     where hygf_power_station.is_delete=0

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

@@ -13,7 +13,7 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
 </select>
 
     <select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney">
-        SELECT * FROM hygf_preparation_money
+        SELECT hygf_preparation_money.*,IFNULL(order_status,arrival_state) as arrivalState,IFNULL(order_status,delivery_state) as deliveryState,(select instance_id from hygf_preparation_money_auditing where preparation_money_id = hygf_preparation_money.sequence_nbr limit 1  ) as instanceId FROM hygf_preparation_money
         <where>
             <if test="dto.consigneeRegion != null and dto.consigneeRegion != ''">
                 and hygf_preparation_money.consignee_region like concat ('%',#{dto.consigneeRegion},'%')
@@ -31,7 +31,7 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
                 and hygf_preparation_money.amos_unit_id = #{dto.amosUnitId}
             </if>
             <if test="dto.flag != null and dto.flag != ''">
-                and hygf_preparation_money.delivery_state != "已作废"
+                and hygf_preparation_money.delivery_state != "已作废" and hygf_preparation_money.delivery_state != "待发货"
             </if>
             <if test="dto.deliveryTimeStart != null and dto.deliveryTimeEnd != ''">
                 and hygf_preparation_money.delivery_time between #{dto.deliveryTimeStart} and #{dto.deliveryTimeEnd}
@@ -39,4 +39,48 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
         </where>
         ORDER BY order_time DESC
     </select>
+
+    <select id="preparationStation" resultType="java.util.Map">
+        select
+        hygf_peasant_household.peasant_household_no as peasantHouseholdNo,
+        hygf_peasant_household.owners_name as ownersName,
+        hygf_peasant_household.regional_companies_name as regionalCompaniesName,
+        hygf_peasant_household.regional_companies_seq as regionalCompaniesSeq,
+        hygf_peasant_household.developer_name as developerName,
+        hygf_peasant_household.developer_id as developeId,
+        hygf_peasant_household.sequence_nbr  as sequenceNbr,
+        concat_ws('/',hygf_peasant_household.project_address_name,hygf_peasant_household.project_address_detail) as address,
+        hygf_peasant_household.project_address_name  as sequenceNbr,
+        hygf_peasant_household.preparation_money_state preparationMoneyState,
+        hygf_document_station.preparation_money_id as preparationMoneyId,
+        hygf_power_station.process_instance_id as instanceId
+        from
+        hygf_peasant_household
+        LEFT JOIN hygf_document_station on  hygf_peasant_household.sequence_nbr =   hygf_document_station.station_id
+        LEFT JOIN hygf_power_station on hygf_peasant_household.sequence_nbr = hygf_power_station.peasant_household_id
+        <where>
+        <if test=" preparationMoneyState == 0 ">
+            and hygf_peasant_household.preparation_money_state in ('待发货','待补货','暂存发货')
+        </if>
+        <if test="regionalCompaniesSeq!=null and regionalCompaniesSeq !=''  ">
+            and hygf_peasant_household.regional_companies_seq  = #{regionalCompaniesSeq}
+        </if>
+        <if test="developerId!=null and developerId !=''">
+            and hygf_peasant_household.developer_id = #{developerId}
+        </if>
+        <if test="state!=null and state !=''">
+            and hygf_peasant_household.preparation_money_state  = #{state}
+        </if>
+        <if test="ownersName!=null and ownersName !=''">
+            and hygf_peasant_household.owners_name like concat ('%',#{ownersName},'%')
+        </if>
+        <if test=" preparationMoneyState == 1 ">
+            and hygf_peasant_household.preparation_money_state not in  ('待发货','待补货','暂存发货') and preparation_money_state is not null and preparation_money_state != ''
+        </if>
+
+
+        </where>
+
+
+    </select>
 </mapper>

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

@@ -66,7 +66,9 @@ from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
     <select id="getuserListByOrgCode" resultType="Map">
 
         select
-        DISTINCT std_user_biz.real_name realName
+        <!-- 2024/07/05 沟通后不用去重 -->
+        <!-- DISTINCT std_user_biz.real_name realName-->
+            std_user_biz.real_name realName
         from
         std_user_biz LEFT JOIN hygf_personnel_business on std_user_biz.sequence_nbr =hygf_personnel_business.foundation_id
 

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
@@ -18,6 +19,9 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,8 +48,9 @@ import java.util.stream.Collectors;
 @RestController
 @Api(tags = "Api")
 @RequestMapping(value = "/household-contract")
+@Slf4j
 public class HouseholdContractController extends BaseController {
-
+    private static final Logger logger = LoggerFactory.getLogger(HouseholdContractController.class);
     @Autowired
     HouseholdContractServiceImpl householdContractServiceImpl;
     @Value("${regionalCompanies.company.seq}")
@@ -229,6 +234,17 @@ public class HouseholdContractController extends BaseController {
         wrapper.eq(ToDoTasks::getState, "待办");
         wrapper.eq(ToDoTasks::getBusinessId, householdContrac.getSequenceNbr());
         ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
+
+        PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getDataByState(householdContrac.getPeasantHouseholdId());
+        System.out.println("开始更新农户发货状态"+householdContrac.getPeasantHouseholdId());
+        if (peasantHousehold != null){
+            System.out.println("开始更新农户发货状态"+householdContrac.getPeasantHouseholdId());
+                peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
+                peasantHouseholdServiceImpl.getBaseMapper().updateById(peasantHousehold);
+            System.out.println("更新成功"+householdContrac.getPeasantHouseholdId());
+
+        }
+
             if(doTasks!=null){
             doTasks.setState("已办");
             doTasks.setCompleteTime(new Date());
@@ -305,6 +321,7 @@ public class HouseholdContractController extends BaseController {
        try {
            householdContract = householdContractServiceImpl.reissueinitiateHouseholdContract(model);
        }catch (Exception e){
+           log.error("重新发起合同错误, 入参: {}, error:", JSON.toJSONString(model), e);
            throw new BadRequest(e.getMessage());
        }
         return ResponseHelper.buildResponse(householdContract);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfPreparationMoneyAuditingController.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.HygfPreparationMoneyAuditingServiceImpl;
+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.HygfPreparationMoneyAuditingDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 投融审核表
+ *
+ * @author system_generator
+ * @date 2024-06-18
+ */
+@RestController
+@Api(tags = "投融审核表Api")
+@RequestMapping(value = "/hygf-preparation-money-auditing")
+public class HygfPreparationMoneyAuditingController extends BaseController {
+
+    @Autowired
+    HygfPreparationMoneyAuditingServiceImpl hygfPreparationMoneyAuditingServiceImpl;
+
+    /**
+     * 新增投融审核表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增投融审核表", notes = "新增投融审核表")
+	public ResponseModel<HygfPreparationMoneyAuditingDto> save(@RequestBody HygfPreparationMoneyAuditingDto model) {
+	    model = hygfPreparationMoneyAuditingServiceImpl.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<HygfPreparationMoneyAuditingDto> updateBySequenceNbrHygfPreparationMoneyAuditing(@RequestBody HygfPreparationMoneyAuditingDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(hygfPreparationMoneyAuditingServiceImpl.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(hygfPreparationMoneyAuditingServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个投融审核表",  notes = "根据sequenceNbr查询单个投融审核表")
+	public ResponseModel<HygfPreparationMoneyAuditingDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(hygfPreparationMoneyAuditingServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "投融审核表分页查询",  notes = "投融审核表分页查询")
+	public ResponseModel<Page<HygfPreparationMoneyAuditingDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<HygfPreparationMoneyAuditingDto> page = new Page<HygfPreparationMoneyAuditingDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(hygfPreparationMoneyAuditingServiceImpl.queryForHygfPreparationMoneyAuditingPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "投融审核表列表全部数据查询",   notes = "投融审核表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<HygfPreparationMoneyAuditingDto>> selectForList() {
+	    return ResponseHelper.buildResponse(hygfPreparationMoneyAuditingServiceImpl.queryForHygfPreparationMoneyAuditingList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfReplenishmentController.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.HygfReplenishmentServiceImpl;
+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.HygfReplenishmentDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-07-02
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/hygf-replenishment")
+public class HygfReplenishmentController extends BaseController {
+
+    @Autowired
+    HygfReplenishmentServiceImpl hygfReplenishmentServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<HygfReplenishmentDto> save(@RequestBody HygfReplenishmentDto model) {
+	    model = hygfReplenishmentServiceImpl.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<HygfReplenishmentDto> updateBySequenceNbrHygfReplenishment(@RequestBody HygfReplenishmentDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(hygfReplenishmentServiceImpl.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(hygfReplenishmentServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<HygfReplenishmentDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(hygfReplenishmentServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<HygfReplenishmentDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<HygfReplenishmentDto> page = new Page<HygfReplenishmentDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(hygfReplenishmentServiceImpl.queryForHygfReplenishmentPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<HygfReplenishmentDto>> selectForList() {
+	    return ResponseHelper.buildResponse(hygfReplenishmentServiceImpl.queryForHygfReplenishmentList());
+	}
+}

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.alibaba.fastjson.JSON;
 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;
@@ -9,6 +10,7 @@ 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 lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -22,6 +24,7 @@ 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.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +46,7 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 @RestController
 @Api(tags = "运维人员Api")
 @RequestMapping(value = "/maintenance")
+@Slf4j
 public class MaintenanceController extends BaseController {
 
     @Autowired
@@ -62,7 +66,12 @@ public class MaintenanceController extends BaseController {
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增运维人员", notes = "新增运维人员")
     public ResponseModel<Maintenance> save(@RequestBody Maintenance model) {
+        try {
             model = maintenanceServiceImpl.saveMaintenance(model);
+        } catch (Exception e) {
+            log.error("农户注册错误, 入参: {}, error:", JSON.toJSONString(model), e);
+            throw new BadRequest(e.getMessage());
+        }
         return ResponseHelper.buildResponse(model);
     }
 

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

@@ -208,6 +208,7 @@ public class PeasantHouseholdController extends BaseController {
 	public ResponseModel<Page<PeasantHousehold>> queryForPage(@RequestParam(value = "current") int current,
 															  @RequestParam(value = "size") int size,
 															  @RequestParam(value = "ownersName",required = false)String ownersName,
+															  @RequestParam(value = "preparationMoneyState",required = false)String preparationMoneyState,
 															  @RequestParam(value = "developerId",required = false)Long developerId) {
 	    Page<PeasantHousehold> page = new Page<PeasantHousehold>();
 	    page.setCurrent(current);
@@ -221,7 +222,7 @@ public class PeasantHouseholdController extends BaseController {
 //        String orgCode = userUnitInformationDto.getAmosDealerOrgCode();
 
 		Integer isCertified = PeasantHouseholdEnum.已认证.getCode();
-		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified));
+		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified,preparationMoneyState));
 	}
 
 	/**

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfReplenishment;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.DocumentStationMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PreparationMoneyMapper;
+import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DesignInformationServiceImpl;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HygfReplenishmentServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PreparationMoneyServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import io.seata.spring.annotation.GlobalTransactional;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -28,6 +31,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Array;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -54,6 +59,8 @@ public class PreparationMoneyController extends BaseController {
     PersonnelBusinessMapper personnelBusinessMapper;
     @Autowired
     DocumentStationMapper documentStationMapper;
+    @Autowired
+	HygfReplenishmentServiceImpl hygfReplenishmentService;
     /**
      * 新增发货单
      *
@@ -62,9 +69,12 @@ public class PreparationMoneyController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增发货单", notes = "新增发货单")
-	public ResponseModel<PreparationMoney> save( @RequestBody PreparationMoney model) {
+	@GlobalTransactional
+	@UserLimits
+	public ResponseModel<PreparationMoney> save( @RequestParam("isSubmit") String isSubmit, @RequestBody PreparationMoney model) {
         AgencyUserModel agencyUserModel= getUserInfo();
-	    model = preparationMoneyServiceImpl.saveOrUpdateObject(model,agencyUserModel);
+	   model = preparationMoneyServiceImpl.saveOrUpdateObjectNew(model,agencyUserModel, isSubmit);
+		//   model = preparationMoneyServiceImpl.saveOrUpdateObject(model,agencyUserModel);
 	    return ResponseHelper.buildResponse(model);
 	}
 
@@ -216,7 +226,7 @@ public class PreparationMoneyController extends BaseController {
     ) {
         List<PeasantHousehold>  list=preparationMoneyMapper.getPeasantHouseholdData(sequenceNbr,ownersName);
 
-       Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
+       Page<PeasantHousehold> pagenew = new Page<>();
         pagenew.setRecords(list);
         pagenew.setTotal(list.size());
         return ResponseHelper.buildResponse(pagenew);
@@ -242,4 +252,95 @@ public class PreparationMoneyController extends BaseController {
 
         return ResponseHelper.buildResponse(preparationMoneyServiceImpl.selectOnePreparationMoney(sequenceNbr));
     }
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/uploadVoucher")
+	@ApiOperation(httpMethod = "POST",value = "上传收获凭证",  notes = "上传收获凭证")
+	@GlobalTransactional
+	public ResponseModel uploadVoucher(@RequestParam(value = "instanceId",required = false) String instanceId,@RequestBody PreparationMoney model, String isSubmit) {
+
+		preparationMoneyServiceImpl.uploadVoucher(model,instanceId,isSubmit);
+		return CommonResponseNewUtil.success();
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/excuteFlow")
+	@ApiOperation(httpMethod = "POST",value = "收货审核",  notes = "收货审核")
+	@GlobalTransactional
+	public ResponseModel excuteFlow(@RequestParam(value = "instanceId" ,required = false) String instanceId,
+									@RequestParam(value = "sequenceNbr") Long sequenceNbr,@RequestBody Map<String, Object> kv) {
+
+		preparationMoneyServiceImpl.excuteFlow(instanceId,kv,sequenceNbr);
+		return CommonResponseNewUtil.success();
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/replenishmentSubmit")
+	@ApiOperation(httpMethod = "POST",value = "补货申请",  notes = "补货申请")
+	@GlobalTransactional
+	public ResponseModel replenishmentSubmit( @RequestBody HygfReplenishment hygfReplenishment) {
+//		HygfReplenishment hygfReplenishment1 = new HygfReplenishment();
+//		BeanUtils.copyProperties(hygfReplenishment,hygfReplenishment1);
+//		hygfReplenishment1.setFile(JSON.toJSONString(hygfReplenishment.getFile()));
+		hygfReplenishmentService.save(hygfReplenishment);
+		preparationMoneyServiceImpl.replenishmentSubmit(hygfReplenishment.getPreparationMoneyId());
+		return CommonResponseNewUtil.success();
+	}
+
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/replenishmentRollback")
+	@ApiOperation(httpMethod = "PUT",value = "补货撤回",  notes = "补货撤回")
+
+	public ResponseModel  replenishmentRollback(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+		preparationMoneyServiceImpl.replenishmentRollback(sequenceNbr);
+		return CommonResponseNewUtil.success();
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/replenishmentAudit")
+	@ApiOperation(httpMethod = "POST",value = "补货审核",  notes = "补货审核")
+	@GlobalTransactional
+	public ResponseModel  replenishmentAudit(@RequestParam(value = "sequenceNbr") Long sequenceNbr,@RequestBody Map<String,Object> kv) {
+		preparationMoneyServiceImpl.replenishmentAudit(sequenceNbr,kv);
+		return CommonResponseNewUtil.success();
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/submitOrder")
+	@ApiOperation(httpMethod = "POST",value = "补货审核",  notes = "补货审核")
+	@GlobalTransactional
+	public ResponseModel  submitOrder(@RequestParam(value = "instanceId") String instanceId,
+									  @RequestParam(value = "isSubmit") String isSubmit,
+									  @RequestBody PreparationMoney model) {
+		preparationMoneyServiceImpl.submitOrder( model,  instanceId,  isSubmit);
+		return CommonResponseNewUtil.success();
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/preparationStation")
+	@ApiOperation(httpMethod = "GET",value = "发货电站",  notes = "发货电站")
+	public ResponseModel<IPage<Map<String,Object>>> preparationStation(
+			@RequestParam(value = "current") Integer current,
+			@RequestParam(value = "size") Integer size,
+			@RequestParam(value = "ownersName",required = false) String ownersName,
+			@RequestParam(value = "regionalcompaniesSeq",required = false) String regionalcompaniesSeq,
+			@RequestParam(value = "developerId",required = false) String developerId,
+			@RequestParam(value = "state",required = false) String state,
+			@RequestParam(value = "preparationMoneyState") String preparationMoneyState){
+
+		return ResponseHelper.buildResponse(preparationMoneyServiceImpl.preparationStation(current,size,preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state)) ;
+	}
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getFromInfo")
+	@ApiOperation(httpMethod = "GET",value = "获取发货电站及区域，经销商公司",  notes = "获取发货电站及区域")
+	public ResponseModel<PreparationMoney> getFromInfo(
+			@RequestParam(value = "ids") String ids){
+		List<String> list = Arrays.asList(ids.split(","));
+		return ResponseHelper.buildResponse(preparationMoneyServiceImpl.getFromInfo(list)) ;
+	}
 }

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

@@ -15,7 +15,9 @@ import com.qiyuesuo.sdk.v2.response.MiniappTicketResult;
 import com.qiyuesuo.sdk.v2.response.SdkResponse;
 import com.qiyuesuo.sdk.v2.utils.Algorithm;
 import com.qiyuesuo.sdk.v2.utils.Base64Utils;
+import com.qiyuesuo.sdk.v2.utils.CollectionUtils;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.CallbackDto;
@@ -23,10 +25,12 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServiceImpl;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PeasantHouseholdServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ToDoTasksServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +60,7 @@ import java.util.Map;
 @RestController
 @Api(tags = "契税锁Api")
 @RequestMapping(value = "/qiyuesuo")
+@Slf4j
 public class QiyuesuoController extends BaseController {
 	private static final Logger logger = LoggerFactory.getLogger(QiyuesuoController.class);
 
@@ -81,6 +86,8 @@ public class QiyuesuoController extends BaseController {
 	private String engineering;
 	@Autowired
 	ContractFillMapper contractFillMapper;
+	@Autowired
+	PeasantHouseholdServiceImpl peasantHouseholdServiceImpl;
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "POST", value = "个人token", notes = "个人token")
@@ -103,15 +110,22 @@ public class QiyuesuoController extends BaseController {
 	@PostMapping(value = "/getContractTokengz/{sequenceNbr}")
 	public ResponseModel<Object> getContractSdkResponseSequenceNbr(@RequestBody ContractMiniappTicketRequest request,
 			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-		QueryWrapper<SealDictionary> queryWrapper = new QueryWrapper();
-		queryWrapper.eq("amos_company_seq", sequenceNbr);
-		SealDictionary sealDictionary = sealDictionaryMapper.selectOne(queryWrapper);
+		SealDictionary sealDictionary = sealDictionaryMapper.selectById(sequenceNbr);
 		request.setUser(new User(sealDictionary.getSealedPhone(), "MOBILE"));
 		SdkResponse<MiniappTicketResult> result = qiyuesuoService.getContractSdkResponse(request);
 		return ResponseHelper.buildResponse(result.getResult());
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "获取所有盖章人员", notes = "获取所有盖章人员")
+	@GetMapping(value = "/getAllUserByCompanySeq")
+	public ResponseModel<List<SealDictionary>> getAll(@RequestParam(value = "companySeq") Long companySeq) {
+		QueryWrapper<SealDictionary> queryWrapper = new QueryWrapper();
+		queryWrapper.eq("amos_company_seq", companySeq);
+		return ResponseHelper.buildResponse(sealDictionaryMapper.selectList(queryWrapper));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "获取合同浏览令牌", notes = "获取合同浏览令牌")
 	@GetMapping(value = "/getContractTokenTicket/{sequenceNbr}")
 	public ResponseModel<Object> getContractTokenTicket(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
@@ -127,6 +141,7 @@ public class QiyuesuoController extends BaseController {
 		try {
 			householdContract = householdContractServiceImpl.initiateHouseholdContract(model);
 		} catch (Exception e) {
+			log.error("创建合同错误, 入参: {}, error:", JSON.toJSONString(model), e);
 			throw new BadRequest(e.getMessage());
 		}
 		return ResponseHelper.buildResponse(householdContract);
@@ -176,7 +191,7 @@ public class QiyuesuoController extends BaseController {
 				wrapper.set(HouseholdContract::getStampStatus, HouseholdContractEnum.盖章状态_已盖章.getCode());
 				wrapper.set(HouseholdContract::getSigningTime, new Date());
 				wrapper.set(HouseholdContract::getStatus, HouseholdContractEnum.合同状态_双方已签署.getCode());
-				wrapper.set(HouseholdContract::getSealedUser, getUserInfo().getRealName());
+			//	wrapper.set(HouseholdContract::getSealedUser, getUserInfo().getRealName());
 				wrapper.eq(HouseholdContract::getContractLockId, CallbackDto.getContractId());
 				householdContractServiceImpl.update(wrapper);
 
@@ -184,6 +199,14 @@ public class QiyuesuoController extends BaseController {
 
 				wrapper4.eq(HouseholdContract::getContractLockId, CallbackDto.getContractId());
 				HouseholdContract contract = householdContractMapper.selectOne(wrapper4);
+				PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getDataByState(contract.getPeasantHouseholdId());
+				logger.info("开始更新农户发货状态"+contract.getPeasantHouseholdId());
+				if (peasantHousehold != null){
+					logger.info("开始更新农户发货状态"+contract.getPeasantHouseholdId());
+					peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
+					peasantHouseholdServiceImpl.getBaseMapper().updateById(peasantHousehold);
+					logger.info("更新成功");
+				}
 
 				LambdaQueryWrapper<ToDoTasks> wrapper1 = new LambdaQueryWrapper<>();
 				wrapper1.eq(ToDoTasks::getType, TaskTypeStationEnum.合同填报.getCode());

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

@@ -119,12 +119,13 @@ public class SurveyInformationController extends BaseController {
 	 * 勘察信息数据提交
 	 *
 	 * @return
+	 * @throws Exception 
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "勘察信息数据提交",   notes = "勘察信息数据提交")
 	@PostMapping(value = "/surveySubmit")
 	public ResponseModel<SurveyInfoAllDto> surveySubmit(@RequestBody SurveyInfoAllDto surveyInfoAllDto,
-																									@RequestParam(value = "operationType") String operationType) {
+																									@RequestParam(value = "operationType") String operationType) throws Exception {
 		SurveyInfoAllDto returnDto = surveyInformationServiceImpl.saveSurveyInfo(surveyInfoAllDto,operationType);
 		return ResponseHelper.buildResponse(returnDto);
 	}

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

@@ -54,11 +54,12 @@ public class WorkOrderController extends BaseController {
      * 新增施工派工工单
      *
      * @return
+     * @throws Exception 
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增施工派工工单", notes = "新增施工派工工单")
-	public ResponseModel<WorkOrder> save(@RequestBody WorkOrder model) {
+	public ResponseModel<WorkOrder> save(@RequestBody WorkOrder model) throws Exception {
         UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 	    model = workOrderServiceImpl.saveWorkOrder(model,userUnitInformationDto);
 	    return ResponseHelper.buildResponse(model);

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

@@ -17,15 +17,18 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceRectificationOrderMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceRectificationOrderService;
+import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
+import com.yeejoin.amos.component.robot.BadRequest;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.seata.spring.annotation.GlobalTransactional;
+import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -47,7 +50,8 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
     private WorkflowImpl workflow;
     @Autowired
     private RedisUtils redisUtils;
-
+    @Resource (type = RedisLockUtil.class)
+    private RedisLockUtil redisLockUtil;
     /**
      * 分页查询
      */
@@ -107,6 +111,17 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
         AcceptanceRectificationOrder entity = new AcceptanceRectificationOrder();
         BeanUtils.copyProperties(model, entity);
 
+        String lockName = String.format("LockName:updateAndDriveWorkflow:%s", entity.getSequenceNbr());
+        Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);
+        if (BooleanUtils.isNotTrue(isLocked)) {
+            throw new BadRequest("其他用户正在操作，请刷新后再试！");
+        }
+        try {
+
+            AcceptanceRectificationOrder acceptanceRectificationOrder = acceptanceRectificationOrderMapper.selectById(entity.getSequenceNbr());
+            if (String.valueOf(RectificationStatusEnum.整改已完成.getCode()).equals(acceptanceRectificationOrder.getRectificationStatus())) {
+                throw new BadRequest("整改已完成，请稍后再试！");
+            }
 
             acceptanceRectificationOrderMapper.updateById(entity);
 
@@ -126,6 +141,9 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
 
                 basicGridAcceptanceMapper.updateById(basicGridAcceptance);
             }
+        } finally {
+            redisLockUtil.releaseLock(lockName);
+        }
         return model;
     }
 }

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
@@ -18,14 +17,17 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceService;
+import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
+import com.yeejoin.amos.component.robot.BadRequest;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -43,6 +45,9 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
     private AcceptanceCheckItemMapper acceptanceCheckItemMapper;
     @Autowired
     WorkflowImpl workflow;
+    @Resource(type = RedisLockUtil.class)
+    private RedisLockUtil redisLockUtil;
+
     /**
      * 分页查询验收列表数据
      *
@@ -111,23 +116,34 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
     }
     @Override
     @GlobalTransactional
-    public void  checkAccept( Long  basicGridAcceptanceId   ,String userId){
-        BasicGridAcceptance basicGridAcceptanc=  basicGridAcceptanceMapper.selectById(basicGridAcceptanceId);
+    public void checkAccept(Long basicGridAcceptanceId, String userId) {
+        String lockName = String.format("LockName:checkAccept:%s", basicGridAcceptanceId);
+        Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);
+        if (BooleanUtils.isNotTrue(isLocked)) {
+            throw new BadRequest("其他用户正在操作，请刷新后再试！");
+        }
+        try {
+            BasicGridAcceptance basicGridAcceptanc = basicGridAcceptanceMapper.selectById(basicGridAcceptanceId);
+            if (AcceptanceStatusEnum.待投融验收.getCode().equals(basicGridAcceptanc.getAcceptanceStatus())) {
+                throw new BadRequest("验收状态已变更为待投融验收，请稍后再试！");
+            }
             basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.待投融验收.getCode());
             basicGridAcceptanc.setAcceptanceRecDate(new Date());
             //执行工作流
-        StandardDto standardDto=new StandardDto();
+            StandardDto standardDto = new StandardDto();
             standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());
-        workflow.standard(basicGridAcceptanc,standardDto,userId);
+            workflow.standard(basicGridAcceptanc, standardDto, userId);
             basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
 
             //线上验收
             LambdaUpdateWrapper<PeasantHousehold> up =new LambdaUpdateWrapper<>();
             up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.线上验收.getCode());
-        long idsk= basicGridAcceptanc.getPeasantHouseholdId();
-        up.eq(PeasantHousehold::getSequenceNbr,idsk);
+            long idsk = basicGridAcceptanc.getPeasantHouseholdId();
+            up.eq(PeasantHousehold::getSequenceNbr, idsk);
             peasantHouseholdMapper.update(null,up);
-
+        } finally {
+            redisLockUtil.releaseLock(lockName);
+        }
     }
 
 

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

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -12,14 +11,18 @@ 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.IBasicGridAcceptanceService;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
+import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
+import com.yeejoin.amos.component.robot.BadRequest;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.DateUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 @Slf4j
@@ -47,7 +50,8 @@ public class BasicGridAcceptanceServiceImpl
 	RegionalCompaniesMapper regionalCompaniesMapper;
 	@Autowired
 	WorkOrderMapper workOrderMapper;
-
+	@Resource (type = RedisLockUtil.class)
+	private RedisLockUtil redisLockUtil;
 	@Autowired
 	PeasantHouseholdMapper peasantHouseholdMapper;
 	@Autowired
@@ -203,8 +207,15 @@ public class BasicGridAcceptanceServiceImpl
 
 	@GlobalTransactional
 	public void execute(AcceptanceCheckItem dto, String userId) {
+		String lockName = String.format("LockName:executeWorkflow:%s", dto.getBasicGridAcceptanceId());
+		Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);
+		if (BooleanUtils.isNotTrue(isLocked)) {
+			throw new BadRequest("其他用户正在操作，请刷新后再试！");
+		}
+		try {
 			// 查询并网审批信息
 			BasicGridAcceptance basicGridAcceptanc = basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
+			String beforeAcceptanceStatus = basicGridAcceptanc.getAcceptanceStatus();
 			String nextNodeKey = basicGridAcceptanc.getNextNodeKey();
 			if (OK.equals(dto.getApprovalStatus())) {
 				if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
@@ -223,7 +234,11 @@ public class BasicGridAcceptanceServiceImpl
 					peasantHouseholdMapper.update(null, up);
 
 				} else {
-
+					AcceptanceStatusEnum acceptanceStatus = AcceptanceStatusEnum.getAcceptanceStatusByKey(nextNodeKey, dto.getApprovalStatus());
+					if (acceptanceStatus == null) {
+						// 说明工作流节点状态执行错误
+						throw new BadRequest("其他用户正在操作，请刷新后再试！");
+					}
 					basicGridAcceptanc
 							.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 				}
@@ -258,11 +273,22 @@ public class BasicGridAcceptanceServiceImpl
 					basicGridAcceptanc
 							.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 				} else {
+					AcceptanceStatusEnum acceptanceStatus = AcceptanceStatusEnum.getAcceptanceStatusByKey(nextNodeKey, dto.getApprovalStatus());
+					if (acceptanceStatus == null) {
+						// 说明工作流节点状态执行错误
+						throw new BadRequest("其他用户正在操作，请刷新后再试！");
+					}
 					basicGridAcceptanc
 							.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 				}
 			}
 
+			if (AcceptanceStatusEnum.线下验收不通过.getCode().equals(basicGridAcceptanc.getAcceptanceStatus())) {
+				if (AcceptanceStatusEnum.线下验收完成.getCode().equals(beforeAcceptanceStatus)) {
+					throw new BadRequest("验收状态已更改为线下验收不通过，请刷新后再试！");
+				}
+			}
+
 			if (nextNodeKey.equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())) {
 				dto.setWorkOrderId(basicGridAcceptanc.getWorkOrderId());
 				dto.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId());
@@ -306,6 +332,9 @@ public class BasicGridAcceptanceServiceImpl
 			}
 
 			basicGridAcceptanceMapper.updateById(workBasicGridAcceptance);
+		} finally {
+			redisLockUtil.releaseLock(lockName);
+		}
 	}
 
 }

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

@@ -30,11 +30,13 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingRectificationOrder;
 import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IFinancingInfoService;
+import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import io.seata.spring.annotation.GlobalTransactional;
+import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,6 +44,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 /**
@@ -71,6 +74,9 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     @Autowired
     private CommonServiceImpl commonService;
 
+    @Resource(type = RedisLockUtil.class)
+    private RedisLockUtil redisLockUtil;
+
     @UserLimits
     public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page, String type, String status, String regionalCompaniesCode, String ownersName) {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
@@ -115,6 +121,13 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     }
 
     public FinancingInfoDto saveModel(FinancingInfoDto model) {
+        String lockName = String.format("LockName:powerStationExamine");
+        try{
+            Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);
+            if (BooleanUtils.isNotTrue(isLocked)) {
+                throw new com.yeejoin.amos.component.robot.BadRequest("其他用户正在操作，请刷新后再试！");
+            }
+
             List<String> ids;
             if (model.getPeasantHouseholdIds().contains(",")) {
                 ids = Arrays.asList(model.getPeasantHouseholdIds().split(","));
@@ -179,12 +192,12 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
                     map.put("instanceId",financingInfos1.getInstanceId());
                     this.execueFlow(map);
                 }
-
                 //发起待办
 //            commonService.buildTaskModel(buildDZTRZTaskModel(model, workflowResultDto, date));
             });
-
-
+        }finally {
+            redisLockUtil.releaseLock(lockName);
+        }
         return model;
     }
 
@@ -281,7 +294,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         if (null == financingAuditingDto.getInstanceId()) {
             financingAuditingDto.setInstanceId(financingAuditing.getInstanceId());
         }
-        financingAuditingDto.setStatus(params.getOrDefault("comments", "").toString());
+        financingAuditingDto.setStatus(params.get("approvalStatus").toString());
         financingAuditingDto.setNodeRouting(FinancingAuditEnum.getNodeByCode(workflowResultDto.getNextNodeKey()));
         financingAuditingService.createWithModel(financingAuditingDto);
 

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfPreparationMoneyAuditing;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HygfPreparationMoneyAuditingMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IHygfPreparationMoneyAuditingService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.HygfPreparationMoneyAuditingDto;
+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-06-18
+ */
+@Service
+public class HygfPreparationMoneyAuditingServiceImpl extends BaseService<HygfPreparationMoneyAuditingDto,HygfPreparationMoneyAuditing,HygfPreparationMoneyAuditingMapper> implements IHygfPreparationMoneyAuditingService {
+    /**
+     * 分页查询
+     */
+    public Page<HygfPreparationMoneyAuditingDto> queryForHygfPreparationMoneyAuditingPage(Page<HygfPreparationMoneyAuditingDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<HygfPreparationMoneyAuditingDto> queryForHygfPreparationMoneyAuditingList()   {
+        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/HygfReplenishmentServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfReplenishment;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HygfReplenishmentMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IHygfReplenishmentService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.HygfReplenishmentDto;
+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-07-02
+ */
+@Service
+public class HygfReplenishmentServiceImpl extends BaseService<HygfReplenishmentDto,HygfReplenishment,HygfReplenishmentMapper> implements IHygfReplenishmentService {
+    /**
+     * 分页查询
+     */
+    public Page<HygfReplenishmentDto> queryForHygfReplenishmentPage(Page<HygfReplenishmentDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<HygfReplenishmentDto> queryForHygfReplenishmentList()   {
+        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/PersonnelBusinessServiceImpl.java

@@ -211,6 +211,13 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
         FeignClientResult<AgencyUserModel> userResult =null;
 
         try {
+            List<Long> newRole = userDataZHDto.getRole();
+            List<Long> oldRole = JSONArray.parseArray(publicAgencyUser.getRole(), Long.class);
+            for(Long item: oldRole) {
+                if(!newRole.contains(item)){
+                    throw new BadRequest("角色只能增加, 不能删除");
+                }
+            }
             // 1 修改平台用户
             List<RoleModel> userRoleList = new ArrayList<>();
             AgencyUserModel agencyUserModel = new AgencyUserModel();
@@ -494,9 +501,44 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
         userDataJBDto.setPosition(JSONArray.parseArray(publicAgencyUse.getPosition(),String.class));
         userDataJBDto.setRegionalCompaniesSeq(personnelBusines.getRegionalCompaniesSeq()!=null?personnelBusines.getRegionalCompaniesSeq().toString():null);
         userDataJBDto.setAmosUnitId(personnelBusines.getAmosUnitId());
+
+        Boolean hasOperationRecords = hasOperationRecords(id);
+        userDataZHDto.setHasOperationRecords(hasOperationRecords);
+        userDataJBDto.setHasOperationRecords(hasOperationRecords);
+
         return new UserDataDto( userDataZHDto, userDataJBDto ,  userDataZZDto);
     }
 
+    /**
+     * 用户是否有业务操作
+     *
+     *
+     * @param id id
+     * @return {@link  Boolean}
+     * @author yangyang
+     * @throws
+     * @date 2024/7/3 16:24
+     */
+    public Boolean hasOperationRecords(String id) {
+        if (StringUtils.isEmpty(id)) {
+            return false;
+        }
+        Boolean operateRecord = false;
+        String userId = personnelBusinessMapper.selectUserInfo(Long.parseLong(id));
+        //添加校验，如果业务表里面有相关的用户id不能删除
+        List<String> tableName = personnelBusinessMapper.selectHygfTableName();
+        if (CollectionUtil.isNotEmpty(tableName)) {
+            for (String table : tableName) {
+                int count = personnelBusinessMapper.countByUserId(table, userId);
+                if (count > 0) {
+                    operateRecord = true;
+                    break;
+                }
+            }
+        }
+        return operateRecord;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteAllBySequenceNbr(Long sequenceNbr) {

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,6 +16,7 @@ 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.api.util.RedisLockUtil;
 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;
@@ -22,6 +24,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +36,7 @@ import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -85,6 +89,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     AmosRequestContext requestContext;
     @Autowired
     WorkflowImpl workflow;
+    @Autowired
+	HouseholdContractMapper householdContractMapper;
+	@Resource (type = RedisLockUtil.class)
+	private RedisLockUtil redisLockUtil;
 
 	public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode,
 			String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName, String processStatus) {
@@ -235,6 +243,11 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 	@Override
 	public String powerStationExamine(long pageId, String nodeCode, String stationId, String taskId,
 			String planInstanceId, Map<String, Object> kv) {
+		String lockName = String.format("LockName:powerStationExamine:%s", stationId);
+		Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);
+		if (BooleanUtils.isNotTrue(isLocked)) {
+			throw new com.yeejoin.amos.component.robot.BadRequest("其他用户正在操作，请刷新后再试！");
+		}
 		String meg = "";
 		// 1. 业务相关数据落表
 		PowerStation powerStation = this.baseMapper.selectById(stationId);
@@ -256,6 +269,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 			switch (nodeByCode) {
 			case 设计审核:
 				powerStation.setTechnologyStatus(resultObj.getName());
+
 				break;
 			case 投融审核:
 				powerStation.setDesignStatus(resultObj.getName());
@@ -347,13 +361,25 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 						.selectById(Long.valueOf(peasantHouseholdId));
 				peasantHousehold.setSurveyOrNot(3);
 				peasantHousehold.setConstructionState(ArrivalStateeEnum.勘察完成.getCode());
+				//当勘察完成并且合同双方已盖章 则为待发货
+				LambdaQueryWrapper<HouseholdContract> queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.eq(HouseholdContract::getStatus,"双方已签署");
+				queryWrapper.eq(HouseholdContract::getPeasantHouseholdId,peasantHousehold.getSequenceNbr());
+				List<HouseholdContract> householdContracts = householdContractMapper.selectList(queryWrapper);
+				if (CollectionUtil.isNotEmpty(householdContracts) &&  householdContracts.size()>0 ){
+					peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
+				}
+
+
 				peasantHouseholdService.saveOrUpdate(peasantHousehold);
 			}
 			// }
 		} catch (Exception e) {
 			e.printStackTrace();
+			log.error("powerStationExamine error:", e);
 
-
+		} finally {
+			redisLockUtil.releaseLock(lockName);
 		}
 		return code;
 

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

@@ -106,7 +106,7 @@ public class QiyuesuoServiceImpl {
 	 *
 	 **/
 
-	public Long addContract(ContractDataDto contractDataDto, List<TemplateParamDto> templateParam) {
+	public Long addContract(ContractDataDto contractDataDto, List<TemplateParamDto> templateParam,List<User> corpOperators) {
 		SdkResponse<Contract> responseObj = null;
 		// 返回结果
 		Contract result = new Contract();
@@ -157,6 +157,8 @@ public class QiyuesuoServiceImpl {
 			Action action = new Action("COMPANY", 0);
 			// 指定印章
 			action.setCorpSealIds(corpSealIds);
+			//指定操作人
+			action.setCorpOperators(corpOperators);
 			signatory2.addAction(action);
 			// 设置签署方
 			contract.addSignatory(signatory1);

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

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationService;
 import com.yeejoin.amos.boot.module.hygf.api.service.ISurveyInformationService;
 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.api.util.RedisLockUtil;
 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;
@@ -26,6 +27,7 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -38,6 +40,7 @@ import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -85,6 +88,8 @@ public class SurveyInformationServiceImpl
 	@Autowired
 	IPowerStationService powerStationService;
 	@Autowired
+	PowerStationMapper powerStationMapper;
+	@Autowired
 	ToDoTasksMapper toDoTasksMapper;
 	@Autowired
 	UserMessageMapper userMessageMapper;
@@ -125,7 +130,8 @@ public class SurveyInformationServiceImpl
 	WorkOrderPowerStationMapper workOrderPowerStationMapper;
 	@Autowired
 	AmosRequestContext requestContext;
-
+	@Resource(type = RedisLockUtil.class)
+	private RedisLockUtil redisLockUtil;
 	@Autowired
 	WorkflowImpl workflow;
 
@@ -145,6 +151,7 @@ public class SurveyInformationServiceImpl
 
 	@GlobalTransactional
 	public SurveyInfoAllDto saveSurveyInfo(SurveyInfoAllDto surveyInfoAllDto, String operationType) {
+		String lockName = null;
 		try {
 
 			JSONArray regionName = getRegionName();
@@ -153,6 +160,31 @@ public class SurveyInformationServiceImpl
 			// 更新勘察基本信息
 			SurveyInformation surveyInformation = BeanDtoUtils.convert(surveyInfoAllDto.getSurveyInformation(),
 					SurveyInformation.class);
+
+			lockName = String.format("LockName:saveSurveyInfo:%s", surveyInformation.getSequenceNbr());
+			Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);
+			if (BooleanUtils.isNotTrue(isLocked)) {
+				throw new BadRequest("其他用户正在操作，请刷新后再试！");
+			}
+
+			QueryWrapper<PeasantHousehold> peasantHouseholdQueryWrapper = new QueryWrapper<>();
+			peasantHouseholdQueryWrapper.eq("survey_information_id", surveyInformation.getSequenceNbr());
+			PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getBaseMapper()
+					.selectOne(peasantHouseholdQueryWrapper);
+
+			PowerStation powerStation = powerStationMapper.selectOne(new LambdaQueryWrapper<PowerStation>()
+					.eq(PowerStation::getPeasantHouseholdId, peasantHousehold.getSequenceNbr()));
+			if (ArrivalStateeEnum.勘察中.getCode().equals(peasantHousehold.getConstructionState())) {
+				// 驳回后重新提交是勘察中->勘察中导致此逻辑有问题,所以去掉这种情况
+				if (powerStation != null
+						&& PowerStationProcessStateEnum.不通过.getName().equals(powerStation.getProcessStatus())) {
+
+				} else {
+					throw new BadRequest("勘察中，请稍后再试！");
+				}
+
+			}
+
 			surveyInformation.setReview(0);
 			if (OPERATION_TYPE_APPLY.equals(operationType) && null == surveyInformation.getCreatorTime()) {
 				surveyInformation.setCreatorTime(new Date());
@@ -166,7 +198,7 @@ public class SurveyInformationServiceImpl
 			// 避免生成多份数据
 			extendedInformationService.saveOrUpdate(extendedInformation, new LambdaQueryWrapper<ExtendedInformation>()
 					.eq(ExtendedInformation::getSurveyInformationId, surveyInformation.getSequenceNbr()));
-            //extendedInformationService.saveOrUpdate(extendedInformation);
+			// extendedInformationService.saveOrUpdate(extendedInformation);
 
 			// 更新勘察明细信息
 			SurveyDetailsDto oldSurveyDetails = surveyInfoAllDto.getSurveyDetails();
@@ -175,7 +207,7 @@ public class SurveyInformationServiceImpl
 			// 避免生成多份数据
 			surveyDetailsService.saveOrUpdate(surveyDetails, new LambdaQueryWrapper<SurveyDetails>()
 					.eq(SurveyDetails::getSurveyInformationId, surveyInformation.getSequenceNbr()));
-            //surveyDetailsService.saveOrUpdate(surveyDetails);
+			// surveyDetailsService.saveOrUpdate(surveyDetails);
 
 			// 更新商务信息
 			CommercialDto oldCommercial = surveyInfoAllDto.getCommercial();
@@ -194,12 +226,15 @@ public class SurveyInformationServiceImpl
 			// 避免生成多份数据
 			commercialService.saveOrUpdate(commercial, new LambdaQueryWrapper<Commercial>()
 					.eq(Commercial::getSurveyInformationId, surveyInformation.getSequenceNbr()));
-            //commercialService.saveOrUpdate(commercial);
+			// commercialService.saveOrUpdate(commercial);
 			// 勘察后，更新状态
-            QueryWrapper<PeasantHousehold> peasantHouseholdQueryWrapper = new QueryWrapper<>();
-            peasantHouseholdQueryWrapper.eq("survey_information_id", surveyInformation.getSequenceNbr());
-            PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getBaseMapper()
-                    .selectOne(peasantHouseholdQueryWrapper);
+			// QueryWrapper<PeasantHousehold> peasantHouseholdQueryWrapper = new
+			// QueryWrapper<>();
+			// peasantHouseholdQueryWrapper.eq("survey_information_id",
+			// surveyInformation.getSequenceNbr());
+			// PeasantHousehold peasantHousehold =
+			// peasantHouseholdServiceImpl.getBaseMapper()
+			// .selectOne(peasantHouseholdQueryWrapper);
 
 			// 更新资料归档信息
 			Information information = BeanDtoUtils.convert(surveyInfoAllDto.getInformation(), Information.class);
@@ -217,7 +252,7 @@ public class SurveyInformationServiceImpl
 			// 避免生成多份数据
 			informationService.saveOrUpdate(information, new LambdaQueryWrapper<Information>()
 					.eq(Information::getSurveyInformationId, surveyInformation.getSequenceNbr()));
-            //informationService.saveOrUpdate(information);
+			// informationService.saveOrUpdate(information);
 
 			peasantHousehold.setOwnersName(surveyInfoAllDto.getSurveyInformation().getOwnersName());
 			peasantHousehold.setTelephone(surveyInfoAllDto.getSurveyInformation().getTelephone());
@@ -280,8 +315,14 @@ public class SurveyInformationServiceImpl
 			}
 			peasantHouseholdServiceImpl.saveOrUpdate(peasantHousehold);
 
+		} catch (BadRequest e1) {
+			throw e1;
 		} catch (Exception e) {
 			e.printStackTrace();
+		} finally {
+			if (StringUtils.isNotEmpty(lockName)) {
+				redisLockUtil.releaseLock(lockName);
+			}
 		}
 
 		return surveyInfoAllDto;
@@ -371,6 +412,7 @@ public class SurveyInformationServiceImpl
 
 		} catch (Exception e) {
 			e.printStackTrace();
+			log.error("submitExamine error:", e);
 		}
 
 //        PowerStation powerStation = powerStationService.getObjByNhId(String.valueOf(peasantHousehold.getSequenceNbr()), PowerStationProcessStateEnum.作废.getCode());

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

@@ -981,7 +981,22 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
            userEmpowerMapper.insert(stdUserEmpower);
        }
 
-
+       // region 同步平台的单位信息
+       QueryWrapper<PersonnelBusiness> personnelBusinessWrapper = new QueryWrapper<>();
+       personnelBusinessWrapper.eq("amos_unit_id", unitInfo.getAmosCompanySeq());
+       List<PersonnelBusiness> personnelBusiness = personnelBusinessMapper.selectList(personnelBusinessWrapper);
+       Long amosDealerId = personnelBusiness.get(0).getAmosDealerId();
+       FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(amosDealerId);
+       if (companyResult == null || companyResult.getStatus() != 200) {
+           throw new BadRequest("修改单位失败！" + companyResult.getDevMessage());
+       }
+       CompanyModel updateCompanyModel = companyResult.getResult();
+       updateCompanyModel.setCompanyName(unitInfo.getName());
+       FeignClientResult<CompanyModel> companyUpdateResult = Privilege.companyClient.update(updateCompanyModel, amosDealerId);
+       if (companyUpdateResult == null || companyUpdateResult.getStatus() != 200) {
+           throw new BadRequest("修改单位失败！" + companyResult.getDevMessage());
+       }
+       // endregion
         return true;
     }
 

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

@@ -57,6 +57,23 @@ public class WorkFlowService {
      * 执行
      *
      * */
+    public ProcessTaskDTO rollBackTask(String processInstanceId) {
+        ProcessTaskDTO processTaskDTO;
+        try {
+            log.info("工作流撤回任务接口:/rollBackTask},请求参数：{}", processInstanceId);
+            processTaskDTO = workFlowFeignService.rollBackTask(processInstanceId).getResult();
+        } catch (Exception e) {
+            log.error("调用工作流撤回任务接口失败", e);
+            throw new RuntimeException("调用工作流撤回任务接口失败");
+        }
+        return processTaskDTO;
+    }
+
+
+    /***
+     * 执行
+     *
+     * */
     public ProcessTaskDTO complete(String taskId, TaskResultDTO data) {
         ProcessTaskDTO processTaskDTO;
         try {
@@ -70,7 +87,6 @@ public class WorkFlowService {
     }
 
 
-
     public List<WorkflowResultDto> buildWorkFlowInfo(List<ProcessTaskDTO> processTaskDTOS) {
         List<WorkflowResultDto> workflowResultDtoList = new ArrayList<>();
         processTaskDTOS.forEach(item -> {

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

@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 施工派工工单服务实现类
@@ -88,7 +89,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	ConstructionRecordsMapper constructionRecordsMapper;
 	@Autowired
 	BasicGridAcceptanceMapper basicGridAcceptanceMapper;
-
+    @Autowired
+	BasicGridAcceptanceServiceImpl basicGridAcceptanceService;
 	@Autowired
 	WorkflowFeignClient workflowFeignClient;
 
@@ -110,7 +112,24 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	}
 
 	@Transactional
-	public WorkOrder saveWorkOrder(WorkOrder model, UserUnitInformationDto userUnitInformationDto) {
+	public WorkOrder saveWorkOrder(WorkOrder model, UserUnitInformationDto userUnitInformationDto) throws Exception {
+
+		// 校验电站已被选
+		List<PeasantHousehold> peasantHouseholdId = model.getPeasantHouseholdId();
+		List<PeasantHousehold> workorderPeasant = new ArrayList<>();
+		for (PeasantHousehold peasantHouse : peasantHouseholdId) {
+			int count = workOrderPowerStationServiceImpl.count(new LambdaQueryWrapper<WorkOrderPowerStation>()
+					.eq(WorkOrderPowerStation::getPeasantHouseholdId, peasantHouse.getSequenceNbr()));
+			if (count > 0) {
+				PeasantHousehold peasantHouseOne = peasantHouseholdMapper.selectById(peasantHouse.getSequenceNbr());
+				workorderPeasant.add(peasantHouseOne);
+			}
+		}
+		if (!workorderPeasant.isEmpty()) {
+			String names = workorderPeasant.stream().map(i -> i.getOwnersName()).collect(Collectors.joining(","));
+			throw new Exception("电站" + names + ",已被工单关联,请重新选择电站");
+		}
+
 		// 保存派工单
 		RegionalCompanies regionalCompanies = regionalCompaniesMapper.selectRegionName(model.getRegionCompanyId());
 		String code = NumberUtil.getCode(CodeEnum.派工单.getCode(), regionalCompanies.getCompanyCode(),
@@ -126,9 +145,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		model.setAmosDealerOrgCode(userUnitInformationDto.getAmosDealerOrgCode());
 
 		workOrderMapper.insert(model);
-		// 保存派工单 电站信息
-		List<PeasantHousehold> peasantHouseholdId = model.getPeasantHouseholdId();
 
+		// 保存派工单 电站信息
 		List<ConstructionRecords> constructionRecordlist = new ArrayList<>();
 		List<WorkOrderPowerStation> li = new ArrayList<>();
 		for (PeasantHousehold peasantHousehold : peasantHouseholdId) {
@@ -253,9 +271,9 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	}
 
 	@Transactional
-	public PowerStationConstructionData addOrUpdate(PowerStationConstructionData powerStationConstructionData) {
-		//如果不是提交进行单独保存
-		if(powerStationConstructionData.isCommitFlow()){
+	public synchronized PowerStationConstructionData addOrUpdate(PowerStationConstructionData powerStationConstructionData) {
+		// 如果不是提交进行单独保存
+		if (powerStationConstructionData.isCommitFlow()) {
 //        if(powerStationConstructionData.getSequenceNbr()!=null){
 			// 修改施工电站状态
 			LambdaUpdateWrapper<WorkOrderPowerStation> up = new LambdaUpdateWrapper();
@@ -295,29 +313,35 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			workOrderMapper.update(null, upq);
 
 		}
-        // 新增施工信息
-        // 防止重复添加
-        LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper();
-        psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId,
-                powerStationConstructionData.getWorkOrderPowerStationId());
-        psc.eq(PowerStationConstructionData::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
-        powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData, psc);
-        // powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
 
 		// 增加操作日志
 		if (powerStationConstructionData.getSequenceNbr() != null) {
 			ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "编辑施工资料",
 					new Date(), "", powerStationConstructionData.getWorkOrderId(),
 					powerStationConstructionData.getWorkOrderPowerStationId(), null, "");
-            constructionRecordsServiceImpl.save(da);
+			LambdaUpdateWrapper<ConstructionRecords> pcr = new LambdaUpdateWrapper<>();
+			pcr.eq(ConstructionRecords::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
+			constructionRecordsServiceImpl.saveOrUpdate(da,pcr);
 
 		} else {
 			ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "新增施工资料",
 					new Date(), "", powerStationConstructionData.getWorkOrderId(),
 					powerStationConstructionData.getWorkOrderPowerStationId(), null, "");
-            constructionRecordsServiceImpl.save(da);
+			LambdaUpdateWrapper<ConstructionRecords> pcr = new LambdaUpdateWrapper<>();
+			pcr.eq(ConstructionRecords::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
+			constructionRecordsServiceImpl.saveOrUpdate(da,pcr);
 		}
 
+		// 新增施工信息
+		// 防止重复添加
+		LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper<>();
+		psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId,
+				powerStationConstructionData.getWorkOrderPowerStationId());
+		psc.eq(PowerStationConstructionData::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
+		powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData, psc);
+		// powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
+
+
 
 //        }else{
 //           //修改施工电站状态
@@ -843,7 +867,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		// 防止重复提交
 		LambdaQueryWrapper<PowerStationEngineeringInfo> pse = new LambdaQueryWrapper<>();
 		pse.eq(PowerStationEngineeringInfo::getWorkOrderId, powerStationEngineeringInfo.getWorkOrderId());
-		//pse.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,powerStationEngineeringInfo.getWorkOrderPowerStationId());
+		// pse.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,powerStationEngineeringInfo.getWorkOrderPowerStationId());
 		// powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo);
 		powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo, pse);
 		// 增加操作日志
@@ -877,9 +901,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 
 	}
 
-	@Transactional(isolation = Isolation.REPEATABLE_READ)
-	public ConstructionRecords addConstructionRecords(ConstructionRecords constructionRecords) {
-		synchronized (constructionRecords) {
+	@Transactional(rollbackFor = Exception.class)
+	public synchronized ConstructionRecords addConstructionRecords(ConstructionRecords constructionRecords) {
         LambdaQueryWrapper<WorkOrderPowerStation> qu = new LambdaQueryWrapper();
         qu.eq(WorkOrderPowerStation::getSequenceNbr, constructionRecords.getWorkOrderPowerStationId());
         WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectOne(qu);
@@ -901,14 +924,16 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
             dat.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
             dat.setGridStatus("1");
 
-				// 新增并网记录
-				LambdaQueryWrapper<BasicGridAcceptance> bga = new LambdaQueryWrapper<>();
-				bga.eq(BasicGridAcceptance::getPeasantHouseholdId, workOrderPowerStation.getPeasantHouseholdId());
-				BasicGridAcceptance b = basicGridAcceptanceMapper.selectOne(bga);
-				// 防止重复增加
-				if (b == null) {
-					basicGridAcceptanceMapper.insert(dat);
-				}
+//				// 新增并网记录
+//				LambdaQueryWrapper<BasicGridAcceptance> bga = new LambdaQueryWrapper<>();
+//				bga.eq(BasicGridAcceptance::getPeasantHouseholdId, workOrderPowerStation.getPeasantHouseholdId());
+//				BasicGridAcceptance b = basicGridAcceptanceMapper.selectOne(bga);
+//				// 防止重复增加
+//				if (b == null) {
+//					basicGridAcceptanceMapper.insert(dat);
+//				}
+            basicGridAcceptanceService.saveOrUpdate(dat,new LambdaQueryWrapper<BasicGridAcceptance>().eq(BasicGridAcceptance::getPeasantHouseholdId,workOrderPowerStation.getPeasantHouseholdId()));
+
             workOrderPowerStationMapper.updateById(workOrderPowerStation);
             // 修改派工单状态
             LambdaQueryWrapper<WorkOrderPowerStation> qu1 = new LambdaQueryWrapper();
@@ -943,7 +968,6 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
         constructionRecords.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
         constructionRecords.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
         constructionRecordsServiceImpl.save(constructionRecords);
-		}
 		return constructionRecords;
 	}
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/UserEmpowerMapper.java

@@ -13,7 +13,7 @@ import java.util.Map;
  * @createDate: 2023/11/9
  */
 public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
-    @Select("select company_name as companyName , level from privilege_company where org_code = #{orgCode}")
+    @Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
     Map<String,String> getCompanyInfoByOrgCode(String orgCode);
 
 }

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

@@ -45,7 +45,7 @@ public class IPermissionServiceImpl implements  IPermissionService {
         } else {
             String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
             Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-            String companyLevel = companyInfo.get("level").toString();
+            String companyLevel = companyInfo.get("level_").toString();
             if (companyLevel.equals("categroy_leve2")) {
                 return null;
             }
@@ -77,7 +77,7 @@ public class IPermissionServiceImpl implements  IPermissionService {
         } else {
             String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
             Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-            String companyLevel = companyInfo.get("level");
+            String companyLevel = companyInfo.get("level_");
             if (companyLevel.equals("categroy_leve2")) {
                 List<StationBasic> stationBasics = stationBasicMapper
                         .selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
@@ -111,7 +111,7 @@ public class IPermissionServiceImpl implements  IPermissionService {
 		} else {
 			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
 			Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-			String companyLevel = companyInfo.get("level").toString();
+			String companyLevel = companyInfo.get("level_").toString();
 			if (companyLevel.equals("categroy_leve2")) {
 				return "all";
 			}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/application-kingbase8.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:54321/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
+emqx.client-user-name=admin
+emqx.client-password=public
+
+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-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/RegionDto.java

@@ -31,7 +31,7 @@ public class RegionDto   {
     private Long parentId;
 
     @ApiModelProperty(value = "等级")
-    @TableField("LEVEL")
+    @TableField("LEVEL_")
     private String level;
 
     @ApiModelProperty(value = "上级编码")

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

@@ -2,9 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.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;
 
@@ -36,7 +34,7 @@ public class Region  {
     /**
      * 等级
      */
-	@TableField("LEVEL")
+	@TableField("LEVEL_")
     private String level;
 
     /**

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/HouseholdPvMapper.xml

@@ -7,7 +7,7 @@
         hp.sequence_nbr as id,
         hp.platform_company_id AS platformCompanyId,
         hp.number,
-        hp.`name`,
+        hp.name,
         hp.sex,
         hp.ID_number AS idNumber,
         hp.expiry_time AS expiryTime,
@@ -106,7 +106,7 @@
             resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.EquipMessageExport">
         SELECT
         (@i:= @i+1) as numSort,
-        hp.`name`,
+        hp.name,
         hp.ID_number AS idNumber,
         hpd.type,
         hpd.name as equipName,

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/MonitorFanIndicatorMapper.xml

@@ -20,12 +20,12 @@
 
     <select id="getBoosterStationInfo" resultType="java.util.Map">
         select
-            `sequence_nbr` as id,
-            `gateway_id` as gatewayId,
-            `booster_name` as text,
+            sequence_nbr as id,
+            gateway_id as gatewayId,
+            booster_name as text,
              booster_name  as boosterName,
-            `booster_code` as boosterCode,
-            `sort` as value
+            booster_code as boosterCode,
+            sort as value
         from booster_station_info
         <where>
             <if test="gatewayId != null and gatewayId != ''">
@@ -44,12 +44,12 @@
     <select id="getBoosterStationInfo2" resultType="java.util.Map">
         select * from
         ((select
-        `sequence_nbr` as id,
-        `gateway_id` as gatewayId,
-        `booster_name` as text,
+        sequence_nbr as id,
+        gateway_id as gatewayId,
+        booster_name as text,
         booster_name as boosterName,
-        `booster_code` as boosterCode,
-        `sort` as value
+        booster_code as boosterCode,
+        sort as value
         from booster_station_info
         <where>
             sort != 2
@@ -66,7 +66,7 @@
         union all
         (select
         '99999' as id,
-        `gateway_id` as gatewayId,
+        gateway_id as gatewayId,
         '1主变' as text,
         '1主变' as boosterName,
         '2' as boosterCode,
@@ -84,12 +84,12 @@
 
     <select id="getMajorBoosterStationInfo" resultType="java.util.Map">
         select
-        `sequence_nbr` as id,
-        `gateway_id` as gatewayId,
-        `booster_name` as text,
+        sequence_nbr as id,
+        gateway_id as gatewayId,
+        booster_name as text,
         booster_name  as boosterName,
-        `booster_code` as boosterCode,
-        `sort` as value
+        booster_code as boosterCode,
+        sort as value
         from booster_station_info
         <where>
             <if test="gatewayId != null and gatewayId != ''">
@@ -103,12 +103,12 @@
 
     <select id="getMajorBoosterStationInfoBySort" resultType="java.util.Map">
         select
-            `sequence_nbr` as id,
-            `gateway_id` as gatewayId,
-            `booster_name` as text,
+            sequence_nbr as id,
+            gateway_id as gatewayId,
+            booster_name as text,
             booster_name  as boosterName,
-            `booster_code` as boosterCode,
-            `sort` as value
+            booster_code as boosterCode,
+            sort as value
         from booster_station_info
         where
             sort = #{sort}
@@ -119,12 +119,12 @@
 
     <select id="getBoosterStationInfoNormal" resultType="java.util.Map">
         select
-        `sequence_nbr` as id,
-        `gateway_id` as gatewayId,
-        `booster_name` as text,
+        sequence_nbr as id,
+        gateway_id as gatewayId,
+        booster_name as text,
         booster_name as boosterName,
-        `booster_code` as boosterCode,
-        `sort` as value
+        booster_code as boosterCode,
+        sort as value
         from booster_station_info
         <where>
             <if test="gatewayId != null and gatewayId != ''">

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonBasicMapper.xml

@@ -9,7 +9,7 @@
         select
         person_basic.sequence_nbr sequenceNbr,
         person_basic.head_photo headphoto,
-        person_account.`name` name,
+        person_account.name name,
         person_basic.sex,
         person_basic.phone phone,
         person_account.project_name projectName,
@@ -83,7 +83,7 @@
     <select id="getEXPersonUser" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.EXPersonUser">
 
         select
-        person_account.`name` name,
+        person_account.name name,
         person_account.job_number jobNumber,
         person_account.project_name projectName,
         person_account.project_department_name departmentName,
@@ -116,7 +116,7 @@
     <select id="getEXPersonUserAll" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.EXPersonUser">
 
         select
-        person_account.`name` name,
+        person_account.name name,
         person_account.job_number jobNumber,
         person_account.project_name projectName,
         person_account.project_department_name departmentName,
@@ -296,7 +296,7 @@
 
     <select id="getPersonStatistics" resultType="com.yeejoin.amos.boot.module.jxiop.api.entity.StationQrCodeStatistics">
         SELECT
-            project_org_code AS `code`,
+            project_org_code AS code,
             count( qrcode_color = 'red' OR NULL ) AS redNum,
             count( qrcode_color = 'yellow' OR NULL ) AS yellowNum,
             count( qrcode_color = 'green' OR NULL ) AS greenNum,
@@ -310,7 +310,7 @@
 
     <select id="getPersonDetailInfoByObjectId" resultType="java.util.Map">
         SELECT
-            IFNULL(b.`name`, '') as `name`,
+            IFNULL(b.name, '') as name,
             IFNULL(a.phone, '') as phone,
             IFNULL(a.post_name, '') as postName,
             IFNULL(b.project_name, '') as stationName,

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -173,9 +173,9 @@
     <update id="updateYardByProjectOrgCode">
         <foreach collection="list" item="item" separator=";">
             update
-            `station_basic`
+            station_basic
             set
-            `qrcode_color` = #{item.qrcodeColor},
+            qrcode_color = #{item.qrcodeColor},
             <if test="item.level != null and item.level != ''">
             risk_Level = #{item.level},
             </if>

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/amosproject/UserEmpowerMapper.xml

@@ -14,7 +14,7 @@
                 AND privilege_company.COMPANY_TYPE=#{companyType}
             </if>
             <if test="level != null and level != ''">
-                AND privilege_company.`LEVEL`=#{level}
+                AND privilege_company.LEVEL_=#{level}
             </if>
             <if test="companyOrgCode != null ">
                 AND privilege_company.ORG_CODE IN

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

+package com.yeejoin.amos.boot.module.jxiop.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.jxiop.biz.service.impl.EnergyAccessServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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 java.util.Map;
+
+
+@RestController
+@Api(tags = "能源接入相关接口")
+@RequestMapping(value = "/energyAccess")
+public class EnergyAccessController extends BaseController {
+    @Autowired
+    EnergyAccessServiceImpl energyAccessServiceImpl;
+
+    private final Logger logger = LoggerFactory.getLogger(EnergyAccessController.class);
+
+    @RequestMapping(value = "/getInstalledCapacity", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "获取并网容量", notes = "获取并网容量")
+    public ResponseModel<Page<Map<String, Object>>> getInstalledCapacity(String current, String pageSize, String code, String sourceStationId, String tp) {
+        logger.info("获取并网容量接口入参：current ={}，pageSize ={}，code = {},sourceStationId = {},tp = {}",current,pageSize,code,sourceStationId,tp);
+        return ResponseHelper.buildResponse(energyAccessServiceImpl.getInstalledCapacity(current, pageSize, code,sourceStationId,tp));
+    }
+
+    @RequestMapping(value = "/getQuotaCompleteInfo", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "获取片区指标完成情况", notes = "获取片区指标完成情况")
+    public ResponseModel<Page<Map<String, Object>>> getQuotaCompleteInfo(String current, String pageSize, String code,String sourceStationId,String tp) {
+        logger.info("获取片区指标完成情况入参：current ={}，pageSize ={}，code = {},sourceStationId = {},tp = {}",current,pageSize,code,sourceStationId,tp);
+        return ResponseHelper.buildResponse(energyAccessServiceImpl.getQuotaCompleteInfo(current, pageSize, code,sourceStationId,tp));
+    }
+}
+
+

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

@@ -276,7 +276,7 @@ public class MonitoringMapController extends BaseController {
         ArrayList<String> stringArrayList = mapRegion.getProvince();
         //变量获取所有的场站信息
         for (int i = 0; i < stringArrayList.size(); i++) {
-            Region region = regionMapper.selectOne(new QueryWrapper<Region>().eq("LEVEL", 1).like("REGION_NAME", stringArrayList.get(i)));
+            Region region = regionMapper.selectOne(new LambdaQueryWrapper<Region>().eq(Region::getLevel, 1).like(Region::getRegionName, stringArrayList.get(i)));
             List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()));
             stationBasicListAll.addAll(stationBasicList);
         }

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/InstalledCapacity.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import lombok.Data;
+
+@Data
+public class InstalledCapacity {
+    //片区名
+    String areaName;
+    //场站名
+    String stationName;
+    //场站数量
+    String stationCount;
+    //装机容量
+    String actualInstalledCapacity;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/initdata/StationCacheDataInit.java

 package com.yeejoin.amos.boot.module.jxiop.biz.initdata;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.MapRegion;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.Region;
@@ -12,16 +24,6 @@ import com.yeejoin.amos.boot.module.jxiop.biz.dto.QueryDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.StationCacheInfoDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
 
 @Component
 public class StationCacheDataInit implements CommandLineRunner {
@@ -42,7 +44,7 @@ public class StationCacheDataInit implements CommandLineRunner {
     public void run(String... args) throws Exception {
         redisTemplate.delete("station_info_cache_bigscreen");
         List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
-        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
+        List<Region> regionList = regionMapper.selectList(new LambdaQueryWrapper<Region>().eq(Region::getLevel, 1));
         List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
         stationBasicList.forEach(stationBasic -> {

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.Map;
+
+public interface EnergyAccessService {
+    Page<Map<String, Object>> getInstalledCapacity(String current, String pageSize, String code, String sourceStationId, String tp);
+
+    Page<Map<String, Object>> getQuotaCompleteInfo(String current, String pageSize, String code, String sourceStationId, String tp);
+}

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
-import com.alibaba.fastjson.JSON;
+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.module.jxiop.api.entity.MapRegion;
@@ -18,13 +18,10 @@ import com.yeejoin.amos.boot.module.jxiop.biz.initdata.StationCacheDataInit;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper;
 
 import lombok.extern.slf4j.Slf4j;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.aggregations.Aggregation;
-import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.elasticsearch.search.aggregations.bucket.terms.ParsedStringTerms;
@@ -228,7 +225,7 @@ public class CommonServiceImpl {
 
     public List<StationCacheInfoDto> getListStationCacheInfoDto() {
         List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
-        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
+        List<Region> regionList = regionMapper.selectList(new LambdaQueryWrapper<Region>().eq(Region::getLevel, 1));
         List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
         for (int i = 0; i < stationBasicList.size(); i++) {

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.api.util.Constants;
+import com.yeejoin.amos.boot.module.jxiop.api.util.HttpRequestUtil;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.EnergyAccessService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class EnergyAccessServiceImpl implements EnergyAccessService {
+
+    @Autowired
+    private HttpRequestUtil httpRequestUtil;
+
+    private final Logger logger = LoggerFactory.getLogger(EnergyAccessServiceImpl.class);
+
+    @Override
+    public Page<Map<String, Object>> getInstalledCapacity(String current, String pageSize, String code, String sourceStationId, String tp) {
+        //改为部盾接口
+        StringBuilder requestUrl = new StringBuilder(Constants.BASE_URL).append("?").append(Constants.get_station_actual_installed_capacity);
+        if (StringUtils.isNotEmpty(code)) {
+            requestUrl.append("&code=").append(code);
+        }
+
+        if (StringUtils.isNotEmpty(sourceStationId)) {
+            requestUrl.append("&source_station_id=").append(sourceStationId);
+        }
+
+        if (StringUtils.isNotEmpty(tp)) {
+            requestUrl.append("&tp=").append(tp);
+        }
+        JSONObject data = httpRequestUtil.getResPonse(requestUrl.toString(), Constants.REQUEST_GET, "",
+                Constants.resovleRule_data);
+
+        List returnList = data.getJSONArray("data");
+        logger.info("获取并网容量接口调用对端返回结果：{}",returnList.toString());
+        Page<Map<String, Object>> pageIPage;
+        returnList.forEach(result -> {
+            JSONObject jsonObject = (JSONObject) result;
+            String actualInstalledCapacity = jsonObject.getString("actual_installed_capacity");
+            if (StringUtils.isNotEmpty(actualInstalledCapacity)) {
+                BigDecimal bd = new BigDecimal(actualInstalledCapacity);
+                jsonObject.put("actual_installed_capacity", bd.setScale(4,BigDecimal.ROUND_HALF_UP));
+            }
+        });
+        int newCurrent = Integer.parseInt(current);
+        int newPageSize = Integer.parseInt(pageSize);
+        if (StringUtils.isBlank(pageSize) || StringUtils.isBlank(pageSize)) {
+            pageIPage = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageIPage = new Page<>(newCurrent, newPageSize);
+        }
+
+        if (CollectionUtils.isEmpty(returnList)) {
+            return pageIPage;
+        }
+
+        pageIPage.setTotal(returnList.size());
+        int endIndex = newCurrent * newPageSize;
+        if (returnList.size() > endIndex) {
+            pageIPage.setRecords(returnList.subList(((newCurrent - 1) * newPageSize), endIndex));
+        } else {
+            pageIPage.setRecords(returnList.subList(((newCurrent - 1) * newPageSize), returnList.size()));
+        }
+        logger.info("获取并网容量接口最终返回结果：{}",pageIPage.getRecords());
+        return pageIPage;
+    }
+
+    @Override
+    public Page<Map<String, Object>> getQuotaCompleteInfo(String current, String pageSize, String code, String sourceStationId, String tp) {
+        //改为部盾接口
+        StringBuilder requestUrl = new StringBuilder(Constants.BASE_URL).append("?").append(Constants.get_quota_complate_info);
+        LocalDate currentDate = LocalDate.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        String formattedDate = currentDate.format(formatter);
+        requestUrl.append("&reporting_data=").append(formattedDate);
+        if (StringUtils.isNotEmpty(code)) {
+            requestUrl.append("&code=").append(code);
+        }
+
+        if (StringUtils.isNotEmpty(sourceStationId)) {
+            requestUrl.append("&source_station_id=").append(sourceStationId);
+        }
+
+        if (StringUtils.isNotEmpty(tp)) {
+            requestUrl.append("&tp=").append(tp);
+        }
+        JSONObject data = httpRequestUtil.getResPonse(requestUrl.toString(), Constants.REQUEST_GET, "",
+                Constants.resovleRule_data);
+
+        List returnList = data.getJSONArray("data");
+        logger.info("获取片区指标完成情况调用对端返回结果：{}",returnList.toString());
+        //rate的值去掉百分号，名称字段名统一用name代替
+        Page<Map<String, Object>> pageIPage;
+        int newCurrent = Integer.parseInt(current);
+        int newPageSize = Integer.parseInt(pageSize);
+        if (StringUtils.isBlank(pageSize) || StringUtils.isBlank(pageSize)) {
+            pageIPage = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageIPage = new Page<>(newCurrent, newPageSize);
+        }
+        if (CollectionUtils.isEmpty(returnList)) {
+            return pageIPage;
+        }
+        returnList.forEach(result -> {
+            String oldName = "";
+            JSONObject jsonObject = (JSONObject) result;
+            String rate = jsonObject.getString("rate");
+            String newRate = "";
+            if (StringUtils.isNotEmpty(rate)) {
+                newRate = rate.replace("%", "");
+                BigDecimal bd = new BigDecimal(newRate);
+                jsonObject.put("rate", bd.setScale(4,BigDecimal.ROUND_HALF_UP));
+            }
+
+            String quota = jsonObject.getString("quota");
+            if (StringUtils.isNotEmpty(quota)) {
+                BigDecimal bd = new BigDecimal(quota);
+                jsonObject.put("quota", bd.setScale(4,BigDecimal.ROUND_HALF_UP));
+            }
+
+            String generatingCapacity = jsonObject.getString("generating_capacity");
+            if (StringUtils.isNotEmpty(generatingCapacity)) {
+                BigDecimal bd = new BigDecimal(generatingCapacity);
+                jsonObject.put("generating_capacity", bd.setScale(4,BigDecimal.ROUND_HALF_UP));
+            }
+
+            jsonObject.put("seriesData", StringUtils.isNotEmpty(newRate) ? Arrays.asList(new BigDecimal(newRate).setScale(4,BigDecimal.ROUND_HALF_UP)) : 0D);
+            jsonObject.put("axisData", Arrays.asList("RATE"));
+            if ("1".equals(tp)) {
+                oldName = jsonObject.getString("station_name");
+                jsonObject.remove("station_name");
+            } else {
+                oldName = jsonObject.getString("area_name");
+                jsonObject.remove("area_name");
+            }
+            jsonObject.put("name", oldName);
+
+        });
+        pageIPage.setTotal(returnList.size());
+        int endIndex = newCurrent * newPageSize;
+        if (returnList.size() > endIndex) {
+            pageIPage.setRecords(returnList.subList(((newCurrent - 1) * newPageSize), endIndex));
+        } else {
+            pageIPage.setRecords(returnList.subList(((newCurrent - 1) * newPageSize), returnList.size()));
+        }
+        logger.info("获取片区指标完成情况最终返回结果：{}",pageIPage.getRecords());
+        return pageIPage;
+    }
+}

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

@@ -87,7 +87,7 @@ public class LargeScreenImpl {
 	 * 全国
 	 */
 	@Scheduled(cron = "0/10 * * * * ?")
-	@PostConstruct
+	//@PostConstruct
 	public Map<String, Double> getqg() {
 		Map<String, Double> mapdta = new HashMap<>();
 		mapdta.put("SS", 0d);
@@ -131,25 +131,26 @@ public class LargeScreenImpl {
 //			}
 //		}
 
-		//改为部盾接口
+		// 改为部盾接口
 		String requestUrl = Constants.BASE_URL + "?" + Constants.get_quota_info;
 		LocalDate currentDate = LocalDate.now();
 		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 		String formattedDate = currentDate.format(formatter);
-	    JSONObject data = httpRequestUtil.getResPonse(requestUrl+"&reporting_data="+formattedDate, Constants.REQUEST_GET, "",
-				Constants.resovleRule_data);
-	    //部盾每天十二点才填报,如果十二点前没有数据则获取前一天的数据
-	    if(data.getDouble("sum_irradiance")==0) 
-	    {
+		JSONObject data = httpRequestUtil.getResPonse(requestUrl + "&reporting_data=" + formattedDate,
+				Constants.REQUEST_GET, "", Constants.resovleRule_data);
+		if (data != null) {
+			// 部盾每天十二点才填报,如果十二点前没有数据则获取前一天的数据
+			if (data.getDouble("sum_irradiance") != null && data.getDouble("sum_irradiance") == 0) {
 				// 计算昨天日期
 				LocalDate yesterday = currentDate.minusDays(1);
 				formattedDate = yesterday.format(formatter);
-	    	data = httpRequestUtil.getResPonse(requestUrl+"&reporting_data="+formattedDate, Constants.REQUEST_GET, "",
-					Constants.resovleRule_data);
+				data = httpRequestUtil.getResPonse(requestUrl + "&reporting_data=" + formattedDate,
+						Constants.REQUEST_GET, "", Constants.resovleRule_data);
 			}
 			mapdta.put("SS", data.getDouble("average_wind_speed"));
 			mapdta.put("ZFS", data.getDouble("avg_irradiance"));
 			mapdta.put("ZFSLJ", data.getDouble("sum_irradiance"));
+		}
 
 //        //日发电量
 //        AtomicReference<Double> dailyPower = new AtomicReference<>(0.0);
@@ -242,7 +243,7 @@ public class LargeScreenImpl {
 	}
 
 	@Scheduled(cron = "0/10 * * * * ?")
-	@PostConstruct
+	//@PostConstruct
 	private void sendQYYXZBMqtt() {
 		List<StationCacheInfoDto> listStationCacheInfoDto = commonServiceImpl.getListStationCacheInfoDto();
 		Map<String, List<StationCacheInfoDto>> belongAreaList = listStationCacheInfoDto.stream()
@@ -257,16 +258,16 @@ public class LargeScreenImpl {
 	/**
 	 * 区域
 	 **/
-	public Map<String, Double> getqy(List<StationCacheInfoDto> gatewayId, String s) {
-		Map<String, Double> mapdta = new HashMap<>();
-		mapdta.put("SS", 0d);
-		mapdta.put("ZFS", 0d);
-		mapdta.put("ZFSLJ", 0d);
-		mapdta.put("RSD", 0d);
-		mapdta.put("YFD", 0d);
-		mapdta.put("NFD", 0d);
-		mapdta.put("YJHWC", 0d);
-		mapdta.put("NJHWC", 0d);
+	public Map<String, String> getqy(List<StationCacheInfoDto> gatewayId, String s) {
+		Map<String, String> mapdta = new HashMap<>();
+		mapdta.put("SS", "0");
+		mapdta.put("ZFS", "0");
+		mapdta.put("ZFSLJ", "0");
+		mapdta.put("RSD", "0");
+		mapdta.put("YFD", "0");
+		mapdta.put("NFD", "0");
+		mapdta.put("YJHWC", "0");
+		mapdta.put("NJHWC", "0");
 //		// 平均数
 //		List<String> value = new ArrayList<>();
 //		List<String> ids = new ArrayList<>();
@@ -401,33 +402,44 @@ public class LargeScreenImpl {
 //		ybfbn = new BigDecimal(ybfbn).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
 //		mapdta.put("NJHWC", ybfbn);
 
-
-		//改为部盾接口
+		// 改为部盾接口
 		String requestUrl = Constants.BASE_URL + "?" + Constants.get_quota_info;
 		LocalDate currentDate = LocalDate.now();
 		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 		String formattedDate = currentDate.format(formatter);
-	    JSONObject data = httpRequestUtil.getResPonse(requestUrl+"&reporting_data="+formattedDate, Constants.REQUEST_GET, "",
-				Constants.resovleRule_data);
-		mapdta.put("Day", data.getDouble("day_generating_capacity"));
-		mapdta.put("Moon", data.getDouble("month_generating_capacity"));
-		mapdta.put("Year", data.getDouble("year_generating_capacity"));
-		mapdta.put("YJHWC", Double.valueOf(data.getString("month_quota_rate").replace("%", "")));
-		mapdta.put("NJHWC", Double.valueOf(data.getString("year_quota_rate").replace("%", "")));
-		
-	    //部盾每天十二点才填报,如果十二点前没有数据则获取前一天的数据
-	    if(data.getDouble("sum_irradiance")==0) 
-	    {
+		JSONObject data = httpRequestUtil.getResPonse(requestUrl + "&reporting_data=" + formattedDate + "&code=" + s,
+				Constants.REQUEST_GET, "", Constants.resovleRule_data);
+		DecimalFormat df = new DecimalFormat("#.0000");
+		if (data.getDouble("day_generating_capacity") != null) {
+			mapdta.put("Day", df.format(Double.valueOf(data.getDouble("day_generating_capacity"))));
+			mapdta.put("RSD", df.format(Double.valueOf(data.getDouble("day_generating_capacity"))));
+		}
+		if (data.getDouble("month_generating_capacity") != null) {
+			mapdta.put("Moon", df.format(Double.valueOf(data.getDouble("month_generating_capacity"))));
+			mapdta.put("YFD", df.format(Double.valueOf(data.getDouble("month_generating_capacity"))));
+		}
+		if (data.getDouble("year_generating_capacity") != null) {
+			mapdta.put("Year", df.format(Double.valueOf(data.getDouble("year_generating_capacity"))));
+			mapdta.put("NFD", df.format(Double.valueOf(data.getDouble("year_generating_capacity"))));
+		}
+		if (data.getString("month_quota_rate") != null) {
+			mapdta.put("YJHWC", data.getString("month_quota_rate").replace("%", ""));
+		}
+		if (data.getString("year_quota_rate") != null) {
+			mapdta.put("NJHWC", data.getString("year_quota_rate").replace("%", ""));
+		}
+
+		// 部盾每天十二点才填报,如果十二点前没有数据则获取前一天的数据
+		if (data.getDouble("sum_irradiance") != null && data.getDouble("sum_irradiance") == 0) {
 			// 计算昨天日期
 			LocalDate yesterday = currentDate.minusDays(1);
 			formattedDate = yesterday.format(formatter);
-	    	data = httpRequestUtil.getResPonse(requestUrl+"&reporting_data="+formattedDate, Constants.REQUEST_GET, "",
-					Constants.resovleRule_data);
+			data = httpRequestUtil.getResPonse(requestUrl + "&reporting_data=" + formattedDate, Constants.REQUEST_GET,
+					"", Constants.resovleRule_data);
 		}
-	    mapdta.put("SS", data.getDouble("average_wind_speed"));
-		mapdta.put("ZFS", data.getDouble("avg_irradiance"));
-		mapdta.put("ZFSLJ", data.getDouble("sum_irradiance"));
-
+		mapdta.put("SS", data.getString("average_wind_speed"));
+		mapdta.put("ZFS", data.getString("avg_irradiance"));
+		mapdta.put("ZFSLJ", data.getString("sum_irradiance"));
 
 		try {
 			System.out.println(JSON.toJSONString(mapdta));

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -140,7 +141,7 @@ public class MonitorServiceImpl implements MonitorService {
      */
     public List<StationCacheInfoDto> getListStationCacheInfoDto() {
         List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
-        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
+        List<Region> regionList = regionMapper.selectList(new LambdaQueryWrapper<Region>().eq(Region::getLevel, 1));
         List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
         for (int i = 0; i < stationBasicList.size(); i++) {

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

@@ -28,6 +28,7 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -420,7 +421,7 @@ public class MonitoringServiceImpl {
 		List<StationBasic> stationBasicList = stationBasicMapper
 				.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area"));
 		List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
-		List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
+		List<Region> regionList = regionMapper.selectList(new LambdaQueryWrapper<Region>().eq(Region::getLevel, 1));
 		mapRegionList.forEach(mapRegion -> {
 			MapAreaInfoDto mapAreaInfoDto = new MapAreaInfoDto();
 			// 开始处理省份名称-三维与二维的名称有差异
@@ -771,7 +772,7 @@ public class MonitoringServiceImpl {
 		// 变量获取所有的场站信息
 		for (int i = 0; i < stringArrayList.size(); i++) {
 			Region region = regionMapper
-					.selectOne(new QueryWrapper<Region>().eq("LEVEL", 1).like("REGION_NAME", stringArrayList.get(i)));
+					.selectOne(new LambdaQueryWrapper<Region>().eq(Region::getLevel, 1).like(Region::getRegionName, stringArrayList.get(i)));
 			List<StationBasic> stationBasicList = stationBasicMapper
 					.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()));
 			stationBasicListAll.addAll(stationBasicList);
@@ -1112,11 +1113,23 @@ public class MonitoringServiceImpl {
 	    String formattedDate = currentDate.format(formatter);
 	    JSONObject data = httpRequestUtil.getResPonse(requestUrl+"&reporting_data="+formattedDate, Constants.REQUEST_GET, "",
 				Constants.resovleRule_data);
-	    resultMap.put("Day", data.getString("day_generating_capacity"));
-	    resultMap.put("Moon", data.getString("month_generating_capacity"));
-	    resultMap.put("Year", data.getString("year_generating_capacity"));
+	    DecimalFormat df = new DecimalFormat("#.0000");
+		if (data.getDouble("day_generating_capacity") != null) {
+			  resultMap.put("Day", df.format(Double.valueOf(data.getDouble("day_generating_capacity"))));
+		}
+		if (data.getDouble("month_generating_capacity") != null) {
+			 resultMap.put("Moon", df.format(Double.valueOf(data.getDouble("month_generating_capacity"))));
+		}
+		if (data.getDouble("year_generating_capacity") != null) {
+			   resultMap.put("Year", df.format(Double.valueOf(data.getDouble("year_generating_capacity"))));
+		}
+		if (data.getString("month_quota_rate") != null) {
 		    resultMap.put("YJHWC", data.getString("month_quota_rate").replace("%", ""));
+		}
+		if (data.getString("year_quota_rate") != null) {
 		    resultMap.put("NJHWC", data.getString("year_quota_rate").replace("%", ""));
+		}
+		
 		try {
 			emqKeeper.getMqttClient().publish("bigscreen_zjrl_topic", JSON.toJSON(page).toString().getBytes("UTF-8"), 1,
 					true);
@@ -1175,7 +1188,7 @@ public class MonitoringServiceImpl {
 		List<HashMap<String, Object>> hashMapList = new ArrayList<>();
 		List<StationBasic> stationBasicList = stationBasicMapper
 				.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
-		List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level", 1));
+		List<Region> regionList = this.regionMapper.selectList(new LambdaQueryWrapper<Region>().eq(Region::getLevel, 1));
 		regionList.forEach(region -> {
 			HashMap<String, Object> hashMap = new HashMap<>();
 			hashMap.put("label", region.getRegionName());

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
+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.module.jxiop.api.dto.RegionDto;
@@ -34,10 +35,10 @@ public class RegionServiceImpl extends BaseService<RegionDto,Region,RegionMapper
     }
 
     public Region getRegionByRegionCode ( String regionCode){
-        return  this.getOne(new QueryWrapper<Region>().eq("REGION_CODE",regionCode));
+        return  this.getOne(new LambdaQueryWrapper<Region>().eq(Region::getRegionCode,regionCode));
     }
     //根据regionName获取regionCode
     public Region getRegionCodeByRegionName(String regionName) {
-        return this.getOne(new QueryWrapper<Region>().like("REGION_NAME",regionName).eq("LEVEL",1));
+        return this.getOne(new LambdaQueryWrapper<Region>().like(Region::getRegionName,regionName).eq(Region::getLevel,1));
     }
 }
\ No newline at end of file

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

@@ -149,3 +149,4 @@ pictureUrl=upload/jxiop/syz/
 idx.predict.serviceUrl=http://10.20.1.157:8095/jxdj/predict-data
 
 forecast.url=
+logic=
\ No newline at end of file

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

+## DB properties:
+## db1-production database
+spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
+spring.db1.datasource.url=jdbc:kingbase8://10.20.1.176:54321/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
+spring.db1.datasource.username=root
+spring.db1.datasource.password=Yeejoin@2020
+spring.db1.datasource.driver-class-name: com.kingbase8.Driver
+## db2-sync_data
+spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
+spring.db2.datasource.url=jdbc:kingbase8://10.20.1.176:54321/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
+spring.db2.datasource.username=root
+spring.db2.datasource.password=Yeejoin@2020
+spring.db2.datasource.driver-class-name: com.kingbase8.Driver
+##db3
+spring.db3.datasource.url=jdbc:TAOS-RS://10.20.1.157: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
+##db4
+spring.db4.datasource.url=jdbc:TAOS-RS://10.20.1.157:6041/iot_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
+
+# kingbase8 backquote not support
+mybatis-plus.global-config.db-config.table-field-strategy=ignore
+
+## 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
+
+
+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
+emqx.client-user-name=admin
+emqx.client-password=public
+
+## 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://10.20.1.157:18086
+#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
+spring.elasticsearch.rest.uris=http://10.20.0.223:9200
+
+spring.elasticsearch.rest.connection-timeout=30000
+
+spring.elasticsearch.rest.username=elastic
+
+spring.elasticsearch.rest.password=Yeejoin@2020
+
+spring.elasticsearch.rest.read-timeout=30000
+
+# ?????????
+fan.statuts.stattuspath=upload/jxiop/device_status
+
+pictureUrl=upload/jxiop/syz/
+
+# Ԥ
+idx.predict.serviceUrl=http://10.20.1.157:8095/jxdj/predict-data
+
+forecast.url=
+logic=
\ No newline at end of file

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

@@ -2,7 +2,7 @@ spring.application.name=AMOS-JXIOP-BIGSCREEN-WJ
 server.servlet.context-path=/jxiop-bigscreen
 server.port=33300
 server.uri-encoding=UTF-8
-spring.profiles.active=dev1
+spring.profiles.active=kingbase8
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/logback-kingbase8.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-bigscreen-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -2,7 +2,7 @@
 <!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.jxiop.biz.mapper2.SjglZsjZsbtzMapper">
     <select id="getStationCapactityByStationWerks" resultType="Double">
-        select SUM(CAPACITYL) from sjgl_zsj_zsbtz where WERKS = #{WERKS}
+        select SUM(IFNULL(trim(CAPACITYL),0)) from sjgl_zsj_zsbtz where WERKS = #{WERKS}
     </select>
 
     <select id="getStationInfoMapByStationWerks" resultType="map">

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/PrivilegeCompanyMapper.java

@@ -10,7 +10,7 @@ import java.util.Map;
 
 public interface PrivilegeCompanyMapper extends BaseMapper<PrivilegeCompany> {
 
-    @Select("select SEQUENCE_NBR as sequenceNbr,ORG_CODE as orgCode,COMPANY_NAME as companyName ,LEVEL as level from privilege_company where COMPANY_TYPE = 'region' and IS_DELETED = 0  ")
+    @Select("select SEQUENCE_NBR as sequenceNbr,ORG_CODE as orgCode,COMPANY_NAME as companyName ,LEVEL_ as level_ from privilege_company where COMPANY_TYPE = 'region' and IS_DELETED = 0  ")
    public List<PrivilegeCompany> getAreaCompany();
 
 

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/UserEmpowerMapper.java

@@ -17,7 +17,7 @@ import java.util.Map;
  * @createDate: 2023/11/9
  */
 public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
-    @Select("select company_name as companyName , level from privilege_company where org_code = #{orgCode}")
+    @Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
     Map<String,String> getCompanyInfoByOrgCode(String orgCode);
 
     List<CompanyModel> getCompanyBoList(@Param("companyType") String companyType,

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

@@ -144,7 +144,7 @@ public class PrivilegeController extends BaseController {
 		} else {
 			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
 			companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-			companyLevel = companyInfo.get("level").toString();
+			companyLevel = companyInfo.get("level_").toString();
 			companyName = companyInfo.get("companyName").toString();
 		}
 		FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(qgCompanyId);

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/PrivilegeCompany.java

@@ -7,8 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.util.List;
-
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
@@ -24,7 +22,7 @@ public class PrivilegeCompany extends BaseEntity {
     private Long parentId;
     @TableField("REGION_SEQ")
     private String regionSeq;
-    @TableField("LEVEL")
+    @TableField("LEVEL_")
     private String level;
     @TableField("EMAIL")
     private String email;

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

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
@@ -392,6 +393,9 @@ public class ExcelServiceImpl {
             QueryWrapper<PersonCertificate> wrapper2 = new QueryWrapper();
             wrapper2.eq("person_id", personAccount.getPersonId());
             PersonCertificate personCertificate = personCertificateService.getOne(wrapper2);
+            if(Objects.isNull(personCertificate)){
+                personCertificate=new PersonCertificate();
+            }
             BeanUtils.copyProperties(exPersonUser, personCertificate);
             listPersonCertificate.add(personCertificate);
         }

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

@@ -53,7 +53,7 @@ public class IPermissionServiceImpl implements IPermissionService {
 		} else {
 			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
 			Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-			String companyLevel = companyInfo.get("level");
+			String companyLevel = companyInfo.get("level_");
 			if (companyLevel.equals("categroy_leve2")) {
 				List<StationBasic> stationBasics = stationBasicMapper
 						.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
@@ -90,7 +90,7 @@ public class IPermissionServiceImpl implements IPermissionService {
 		} else {
 			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
 			Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-			String companyLevel = companyInfo.get("level");
+			String companyLevel = companyInfo.get("level_");
 			if (companyLevel.equals("categroy_leve2")) {
 				List<StationBasic> stationBasics = stationBasicMapper
 						.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
@@ -140,7 +140,7 @@ public class IPermissionServiceImpl implements IPermissionService {
         } else {
             String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
             Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-            String companyLevel = companyInfo.get("level");
+            String companyLevel = companyInfo.get("level_");
             if (companyLevel.equals("categroy_leve2")) {
                 map.put("isStation","false");
             }

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

@@ -185,6 +185,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         // 人员基础信息
         PersonBasic personBasic = new PersonBasic();
         BeanUtils.copyProperties(personUser, personBasic);
+        personBasic.setRecDate(new Date());
         // 默认红码
         personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
         personBasic.setQrcodeDesc("证书不全");
@@ -430,8 +431,19 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         PersonAccount oldpersonAccount = new PersonAccount();
         personUser.setPhone(personAccount.getPhoneNum());
 
+        oldpersonAccount = personAccountService.getById(personAccount.getSequenceNbr());
+        // region 判断工号是否存在
+        if (!personAccount.getJobNumber().equals(oldpersonAccount.getJobNumber())) {
+            List<Map<String, Object>> maps = privilegeCompanyMapper.selectJobNumIsExist(personAccount.getJobNumber());
+            if (CollectionUtils.isNotEmpty(maps) || maps.size()> 0) {
+                throw new BadRequest("工号已存在");
+            }
+        }
+        // endregion
+
         // 人员基础信息
         PersonBasic personBasic = personBasicMapper.selectById(sequenceNbr);
+        personBasic.setRecDate(new Date());
         personBasic.setSequenceNbr(sequenceNbr);
         personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
         personAccount.setSecondaryPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
@@ -536,7 +548,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
 
         // 人员账号信息
         personAccount.setPersonId(sequenceNbr);
-        oldpersonAccount = personAccountService.getById(personAccount.getSequenceNbr());
+
         personAccountService.updateById(personAccount);
         // 新增平台账号
         // 组装数据

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

@@ -37,6 +37,6 @@ public class RegionServiceImpl extends BaseService<RegionDto,Region,RegionMapper
     }
     //根据regionName获取regionCode
     public Region getRegionCodeByRegionName(String regionName) {
-        return this.getOne(new QueryWrapper<Region>().like("REGION_NAME",regionName).eq("LEVEL",1));
+        return this.getOne(new QueryWrapper<Region>().like("REGION_NAME",regionName).eq("LEVEL_",1));
     }
 }
\ No newline at end of file

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

@@ -34,6 +34,7 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -102,7 +103,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
 
     @Transactional
     public void add(StationBasic stationBasic) {
-
+        stationBasic.setRecDate(new Date());
         //场站坐标信息
         List<StationCoordinate> list = stationBasic.getStationCoordinate();
         List<StationCoordinate> listdate = new ArrayList<>();
@@ -204,7 +205,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
 
     @Transactional
     public void update(StationBasic stationBasic) {
-
+        stationBasic.setRecDate(new Date());
         //场站坐标信息
         List<StationCoordinate> list = stationBasic.getStationCoordinate();
         List<StationCoordinate> listdate = new ArrayList<>();

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/amosprojectmapper/UserEmpowerMapper.java

@@ -12,7 +12,7 @@ import java.util.Map;
  * @createDate: 2023/11/9
  */
 public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
-    @Select("select company_name as companyName , level from privilege_company where org_code = #{orgCode}")
+    @Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
     Map<String,String> getCompanyInfoByOrgCode(String orgCode);
 
 }

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

@@ -385,7 +385,7 @@ public class CommonServiceImpl {
      */
     public List<StationCacheInfoDto> getListStationCacheInfoDto() {
         List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
-        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
+        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL_", 1));
         List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area"));
         //.isNotNull("fan_gateway_id"));

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

@@ -41,7 +41,7 @@ public class JxiopMonitorMapPermissionServiceImpl {
         } else {
             String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
             Map<String,String>  companyInfo= userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-            String companyLevel = companyInfo.get("level").toString();
+            String companyLevel = companyInfo.get("level_").toString();
             if (companyLevel.equals("categroy_leve2")) {
                 result.put("showType", "all");
                 return result;

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

@@ -309,7 +309,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 		} else {
 			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
 			Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-			companyLevel = companyInfo.get("level").toString();
+			companyLevel = companyInfo.get("level_").toString();
 		}
 		StationBasic stationBasic = stationBasicMapper.selectById(sequenceNbr);
 		List<Integer> integers = JSON.parseArray(stationBasic.getBelongArea(), Integer.class);

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

@@ -210,7 +210,7 @@ public class MonitorServiceImpl implements MonitorService {
     public List<RegionNationWideDto> getNationWideInfo(String provinceName, String type) {
         List<RegionNationWideDto> regionNationWideDtoList = new ArrayList<>();
         List<StationCacheInfoDto> stationCacheInfoDtoList = this.getListStationCacheInfoDto();
-        List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level", 1));
+        List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level_", 1));
         List<StationCacheInfoDto> list = new ArrayList<>();
         if ((!ObjectUtils.isEmpty(type) && type.equals("gis")) && (ObjectUtils.isEmpty(provinceName) || provinceName.equals(""))) {
             for (int i = 0; i < regionList.size(); i++) {
@@ -434,7 +434,7 @@ public class MonitorServiceImpl implements MonitorService {
      */
     public List<StationCacheInfoDto> getListStationCacheInfoDto() {
         List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
-        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
+        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL_", 1));
         List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
         for (int i = 0; i < stationBasicList.size(); i++) {
@@ -567,7 +567,7 @@ public class MonitorServiceImpl implements MonitorService {
         ArrayList<String> stringArrayList = mapRegion.getProvince();
         //变量获取所有的场站信息
         for (int i = 0; i < stringArrayList.size(); i++) {
-            Region region = regionMapper.selectOne(new QueryWrapper<Region>().eq("LEVEL", 1).like("REGION_NAME", stringArrayList.get(i)));
+            Region region = regionMapper.selectOne(new QueryWrapper<Region>().eq("LEVEL_", 1).like("REGION_NAME", stringArrayList.get(i)));
             List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()));
             stationBasicListAll.addAll(stationBasicList);
         }

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

@@ -120,7 +120,7 @@ public class MonitoringServiceIMQTTmpl {
         Page<SocialContributionDto> socialContributionDtoPage = new Page<SocialContributionDto>();
         logger.error("--------------------------区域实时数据消息开始发送----------------------------------------------");
         List<SocialContributionDto> socialContributionDtoList = new ArrayList<>();
-        Region region = this.regionMapper.selectOne(new QueryWrapper<Region>().eq("level", 1).eq("region_name", "江西省"));
+        Region region = this.regionMapper.selectOne(new QueryWrapper<Region>().eq("level_", 1).eq("region_name", "江西省"));
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()).isNotNull("fan_gateway_id"));
         int year = Calendar.getInstance().get(Calendar.YEAR);
         List<Long> fdz = stationBasicList.stream().map(StationBasic::getSequenceNbr).collect(Collectors.toList());

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

@@ -92,7 +92,7 @@ public class MonitoringServiceImpl {
     public List<RegionNationWideDto> getNationWideInfo(String provinceName, String type) {
         List<RegionNationWideDto> regionNationWideDtoList = new ArrayList<>();
         List<StationCacheInfoDto> stationCacheInfoDtoList = commonServiceImpl.getListStationCacheInfoDto();
-        List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level", 1));
+        List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level_", 1));
         List<StationCacheInfoDto> list = new ArrayList<>();
         //如果 provinceName 为空则表示当前为全国地图 否则则为省份地图
 //        if (ObjectUtils.isEmpty(provinceName) || provinceName.equals("")) {
@@ -488,7 +488,7 @@ public class MonitoringServiceImpl {
         List<MapAreaInfoDto> mapAreaInfoDtoList = new ArrayList<>();
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area"));
         List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
-        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
+        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL_", 1));
         mapRegionList.forEach(mapRegion -> {
             MapAreaInfoDto mapAreaInfoDto = new MapAreaInfoDto();
             //开始处理省份名称-三维与二维的名称有差异
@@ -525,7 +525,7 @@ public class MonitoringServiceImpl {
     public List<HomeMapStationInfoDto> getStaitonListInfoByAreaName(String areaName) {
         List<HomeMapStationInfoDto> homeMapStationInfoDtoList = new ArrayList<>();
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
-        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
+        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL_", 1));
         //根据areaName获取area信息
         MapRegion mapRegion = mapRegionMapper.selectOne(new QueryWrapper<MapRegion>().eq("name", areaName));
         //获取片区下的省份名称
@@ -805,7 +805,7 @@ public class MonitoringServiceImpl {
         ArrayList<String> stringArrayList = mapRegion.getProvince();
         //变量获取所有的场站信息
         for (int i = 0; i < stringArrayList.size(); i++) {
-            Region region = regionMapper.selectOne(new QueryWrapper<Region>().eq("LEVEL", 1).like("REGION_NAME", stringArrayList.get(i)));
+            Region region = regionMapper.selectOne(new QueryWrapper<Region>().eq("LEVEL_", 1).like("REGION_NAME", stringArrayList.get(i)));
             List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()));
             stationBasicListAll.addAll(stationBasicList);
         }
@@ -1214,7 +1214,7 @@ public class MonitoringServiceImpl {
     public List<HashMap<String, Object>> getSelectDataForNational() {
         List<HashMap<String, Object>> hashMapList = new ArrayList<>();
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
-        List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level", 1));
+        List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level_", 1));
         regionList.forEach(region -> {
             HashMap<String, Object> hashMap = new HashMap<>();
             hashMap.put("label", region.getRegionName());

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

@@ -38,6 +38,6 @@ public class RegionServiceImpl extends BaseService<RegionDto,Region,RegionMapper
     }
     //根据regionName获取regionCode
     public Region getRegionCodeByRegionName(String regionName) {
-        return this.getOne(new QueryWrapper<Region>().like("REGION_NAME",regionName).eq("LEVEL",1));
+        return this.getOne(new QueryWrapper<Region>().like("REGION_NAME",regionName).eq("LEVEL_",1));
     }
 }
\ No newline at end of file

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

@@ -34,11 +34,11 @@ spring.db3.datasource.password=taosdata
 spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
 
 ## eureka properties:
-eureka.instance.hostname=10.20.1.160
+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=10.20.1.210
+spring.redis.host=47.92.234.253
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
@@ -74,10 +74,10 @@ 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
-mqtt.scene.host=mqtt://172.16.10.220:8083/mqtt
+mqtt.scene.host=mqtt://47.92.234.253:18083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000

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

@@ -90,3 +90,8 @@ spring.elasticsearch.rest.read-timeout=30000
 
 #elasticsearch.username= elastic
 #elasticsearch.password= 123456
+
+amos.system.user.user-name=cz
+amos.system.user.password=a1234567
+amos.system.user.product=AMOS_STUDIO_WEB
+amos.system.user.app-key=AMOS_STUDIO
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -11,7 +11,7 @@
             ( SBMC, 4 ) AS NAME,
             GROUP_CONCAT(REPLACE (REPLACE( substring( SBMC, 5 ),'风机系统', '' ) ,"#","" )) as equipNum
         FROM
-            `sjgl_zsj_zsbtz`
+            sjgl_zsj_zsbtz
         WHERE
             MACHGENRE = #{DATAID} and WERKS = #{WERKS}
         GROUP BY
@@ -31,7 +31,7 @@
             FROM
             sjgl_zsj_zsbtz
             WHERE
-            FSB IN ( SELECT DBID FROM `sjgl_zsj_zsbtz` WHERE MACHGENRE = ( SELECT DATAID FROM `tpri_dmp_databook` WHERE DATANAME = #{DATAID} ) AND WERKS = #{WERKS} )
+            FSB IN ( SELECT DBID FROM sjgl_zsj_zsbtz WHERE MACHGENRE = ( SELECT DATAID FROM tpri_dmp_databook WHERE DATANAME = #{DATAID} ) AND WERKS = #{WERKS} )
             ) B
         GROUP BY
             B.FSB
@@ -39,7 +39,7 @@
 
     <select id="getEquipQrcodeInfo" resultType="com.yeejoin.amos.boot.module.jxiop.api.entity.StationQrCodeStatistics">
         SELECT
-            WERKS AS `code`,
+            WERKS AS code,
             count( QRCODE_COLOR = 'red' OR NULL ) AS redNum,
             count( QRCODE_COLOR = 'yellow' OR NULL ) AS yellowNum,
             count( QRCODE_COLOR = 'green' OR NULL ) AS greenNum,
@@ -53,7 +53,7 @@
 
     <select id="getTaskQrcodeInfo" resultType="com.yeejoin.amos.boot.module.jxiop.api.entity.StationQrCodeStatistics">
         SELECT
-            WERKS AS `code`,
+            WERKS AS code,
             count( QRCODE_COLOR = 'red' OR NULL ) AS redNum,
             count( QRCODE_COLOR = 'yellow' OR NULL ) AS yellowNum,
             count( QRCODE_COLOR = 'green' OR NULL ) AS greenNum,

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/SystemEnumMapper.xml

@@ -5,6 +5,6 @@
 
 
     <select id="getStatusMonitoring" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.SystemEnumDto">
-        SELECT * FROM `system_enum` WHERE type = #{type} and system_name = #{systemName}
+        SELECT * FROM system_enum WHERE type = #{type} and system_name = #{systemName}
     </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/TemporaryDataMapper.xml

@@ -9,7 +9,7 @@
         created_time as createdTime ,
         equipmentIndexName
         FROM
-        `temporary_data`
+        temporary_data
         <where>
             <if test="gatewayId != null and gatewayId != ''">
                 gatewayId = #{gatewayId}
@@ -27,7 +27,7 @@
         created_time as createdTime ,
         equipmentIndexName
         FROM
-        `temporary_data`
+        temporary_data
         <where>
             <if test="gatewayId != null and gatewayId != ''">
                 gatewayId = #{gatewayId}
@@ -51,16 +51,16 @@
         <if test="gatewayId != null and gatewayId != ''">
             and   gatewayId = #{gatewayId}
         </if>
-         ORDER BY `value` LIMIT 1 ) AS minTime,
-	        max( `value` ) AS max,
+         ORDER BY value LIMIT 1 ) AS minTime,
+	        max( value ) AS max,
 	     ( SELECT created_time FROM temporary_data WHERE
         equipmentIndexName =#{equipmentIndexName}
         <if test="gatewayId != null and gatewayId != ''">
             and   gatewayId = #{gatewayId}
-        </if> ORDER BY `value` DESC LIMIT 1 ) AS maxTime,
-	      min( `value` ) AS min
+        </if> ORDER BY value DESC LIMIT 1 ) AS maxTime,
+	      min( value ) AS min
         FROM
-            `temporary_data`
+            temporary_data
         <where>
             <if test="gatewayId != null and gatewayId != ''">
                 gatewayId = #{gatewayId}  and equipmentIndexName =#{equipmentIndexName}
@@ -76,7 +76,7 @@
         SELECT
            *
         FROM
-            `temporary_data`
+            temporary_data
 
     </select>
 </mapper>

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

@@ -386,7 +386,7 @@ public class CommonServiceImpl {
      */
     public List<StationCacheInfoDto> getListStationCacheInfoDto() {
         List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
-        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
+        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL_", 1));
         List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
         for (int i = 0; i < stationBasicList.size(); i++) {