Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/1
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="DealerReviewDto", description="经销商审核")
+public class DealerReviewDto extends BaseDto {
+    /**
+     * 流程id
+     */
+    private String processInstanceId;
+
+    /**
+     * 经销商id
+     */
+    private String unitInfoId;
+
+    /**
+     * 任务id
+     */
+    private String taskId;
+
+    /**
+     * 流程定义id
+     */
+    private String processDefinitionId;
+
+    /**
+     * 小程序路由
+     */
+    private String nodeRouting;
+    /*
+     *
+     * 角色
+     * */
+    private String nodeRole;
+
+    /**
+     * 当前流程节点
+     */
+    private String nextProcessNode;
+
+    /**
+     * 当前流程节点
+     */
+    private String flowTaskId;
+
+    /**
+     * 计划实例id
+     */
+    private String planInstanceId;
+
+
+
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/1
+ */
+@Data
+public class ReviewDto {
+
+    protected Long sequenceNbr;
+
+    private String  name;
+    private String  legalPersonName;
+    private String	creditCode;
+    private String	headName;
+    private String	headPhone;
+    private String  registerPcd;
+    private String	userNum;
+    private String blacklist;
+    private String auditStatus;
+
+}

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -92,5 +93,12 @@ public class UnitInfoDto  extends BaseDto {
 
     @ApiModelProperty(value = "管辖单位id")
     private String managementUnitId;
-
+    /**
+     *是否加入黑名单
+     * */
+    private String blacklist;
+    /**
+     *审核状态
+     * */
+    private String auditStatus;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DealerReview.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;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/1
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_dealer_review")
+public class DealerReview extends BaseEntity {
+
+
+
+    /**
+     * 流程id
+     */
+    @TableField("process_instance_id")
+    private String processInstanceId;
+
+    /**
+     * 经销商id
+     */
+    @TableField("unit_info_id")
+    private String unitInfoId;
+
+    /**
+     * 任务id
+     */
+    @TableField("task_id")
+    private String taskId;
+
+    /**
+     * 流程定义id
+     */
+    @TableField("process_definition_id")
+    private String processDefinitionId;
+
+    /**
+     * 小程序路由
+     */
+    @TableField("node_routing")
+    private String nodeRouting;
+    /*
+    *
+    * 角色
+    * */
+    @TableField("node_role")
+    private String nodeRole;
+
+    /**
+     * 当前流程节点
+     */
+    @TableField("next_process_node")
+    private String nextProcessNode;
+
+    /**
+     * 当前流程节点
+     */
+    @TableField("flow_task_id")
+    private String flowTaskId;
+
+    /**
+     * 计划实例id
+     */
+    @TableField("plan_instance_id")
+    private String planInstanceId;
+
+}
\ No newline at end of file

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

@@ -166,5 +166,14 @@ public class UnitInfo extends BaseEntity {
      */
     @TableField("management_unit_id")
     private String managementUnitId;
-
+    /**
+     *是否加入黑名单
+     * */
+    @TableField("blacklist")
+    private String blacklist;
+    /**
+     *审核状态
+     * */
+    @TableField("audit_status")
+    private String auditStatus;
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DealerReview;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/1
+ */
+public interface DealerReviewMapper extends BaseMapper<DealerReview> {
+
+    List<ReviewDto> queryForDealerReviewPage(ReviewDto reviewDto);
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
+
+/**
+ *
+ * 经销商审核
+ *
+ * */
+public interface IDealerReviewService {
+
+    public PageInfo<ReviewDto> queryForDealerReviewPage(int pageNum, int pageSize, ReviewDto reviewDto);
+
+
+}

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

@@ -16,4 +16,8 @@ public interface IUnitInfoService {
     Collection getManagementUnitTree(String orgCode);
 
     UnitRegisterDto registerUnit(UnitRegisterDto model);
+
+
+
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/DealerReviewMapper.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.DealerReviewMapper">
+
+    <select id="queryForDealerReviewPage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto" >
+
+    select
+    u.sequence_nbr sequenceNbr,
+    u.`name`,
+    c.legal_person_name legalPersonName,
+    c.credit_code creditCode,
+    u.head_name headName,
+    u.head_phone headPhone,
+    u.register_pcd registerPcd,
+    u.blacklist blacklist,
+    u.audit_status auditStatus
+    from  hygf_commerce_info c  LEFT JOIN hygf_unit_info u on c.unit_seq=u.sequence_nbr
+        <where>
+            u.is_delete=0
+
+            <if test="name != null and name != ''">
+                AND u.`name` like concat('%',#{name},'%')
+            </if>
+
+        </where>
+        ORDER BY u.rec_date DESC
+
+
+    </select>
+
+
+
+
+</mapper>
\ 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/controller/UnitInfoController.java

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
+import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UnitRegisterDto;
 import com.yeejoin.amos.boot.module.hygf.api.hwsms.SendSmsCode;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DealerReviewServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -65,6 +68,8 @@ public class UnitInfoController extends BaseController {
 	SendSmsCode sendSmsCode;
 
 	public static final String HYGF_USER_TEL = "hygf_tel_";
+    @Autowired
+    DealerReviewServiceImpl dealerReviewServiceImpl;
 
 	/**
 	 * 验证码过期时间
@@ -129,6 +134,18 @@ public class UnitInfoController extends BaseController {
 	    return ResponseHelper.buildResponse(unitInfoServiceImpl.queryForUnitInfoPage(page));
 	}
 
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/queryForDealerReviewPage")
+    @ApiOperation(httpMethod = "GET",value = "经销商人员信息分页查询",  notes = "经销商人员信息分页查询")
+    public ResponseModel<PageInfo<ReviewDto>> queryForDealerReviewPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size, @RequestParam(value = "reviewDto") ReviewDto reviewDto) {
+        PageInfo<ReviewDto> page=dealerReviewServiceImpl.queryForDealerReviewPage(current,size,reviewDto);
+        return ResponseHelper.buildResponse(page);
+    }
+
+
+
 	/**
 	 * 列表全部数据查询
      *

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DealerReviewDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.UnitInfoDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DealerReview;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.DealerReviewMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IDealerReviewService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/1
+ */
+@Service
+public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, DealerReview, DealerReviewMapper> implements IDealerReviewService {
+    @Autowired
+    DealerReviewMapper dealerReviewMapper;
+
+    @Override
+    public PageInfo<ReviewDto> queryForDealerReviewPage(int pageNum, int pageSize,  ReviewDto reviewDto){
+        PageHelper.startPage(pageNum,  pageSize);
+        List<ReviewDto> list= dealerReviewMapper.queryForDealerReviewPage(reviewDto);
+        PageInfo<ReviewDto> page=new PageInfo(list);
+        return page;
+    }
+}

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

@@ -231,7 +231,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             AgencyUserModel agencyUserModel = new AgencyUserModel();
             agencyUserModel.setUserName(loginName);
             agencyUserModel.setRealName(adminUserName);
-            agencyUserModel.setLockStatus("UNLOCK");
+            agencyUserModel.setLockStatus("LOCK");
             agencyUserModel.setPassword(pwd);
             agencyUserModel.setRePassword(pwd);
             agencyUserModel.setAgencyCode("JXIOP");

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

@@ -130,4 +130,11 @@ public class MonitoringMapController extends BaseController {
     public ResponseModel<HashMap<String, List<String>>> getPowerGenerationTrendsOfCompletionTopFive(@RequestParam(required = false)String areaName) {
         return  ResponseHelper.buildResponse(monitoringServiceImpl.getPowerGenerationTrendsOfCompletionTopFive(areaName));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(value = "监盘首页-发电小时排名top3")
+    @GetMapping("/getPowerGenerationTrendsOfCompletionTopThree")
+    public ResponseModel<Page<HashMap<String, String>>> getPowerGenerationTrendsOfCompletionTopThree(@RequestParam(required = false)String areaName,@RequestParam(required = false,defaultValue = "0")String tabValue) {
+        return  ResponseHelper.buildResponse(monitoringServiceImpl.getPowerGenerationTrendsOfCompletionTopThree(tabValue,areaName));
+    }
 }

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.unbescape.css.CssIdentifierEscapeLevel;
 
 import java.net.URLDecoder;
 import java.util.*;
@@ -645,6 +646,8 @@ public class MonitoringServiceImpl {
         hashMap.put("seriesData", yList);
         return hashMap;
     }
+
+
     public List<String> getXListofRecentOneYear(){
         List<String> xList = new ArrayList<>();
         Calendar calendar = Calendar.getInstance();
@@ -656,4 +659,67 @@ public class MonitoringServiceImpl {
         }
         return xList;
     }
+
+
+    public Page<HashMap<String,String>> getPowerGenerationTrendsOfCompletionTopThree(String tabValue,String areaName){
+        Page<HashMap<String,String>> page = new Page<>(1,3);
+        List<HashMap<String,String>> mapList= new ArrayList<>();
+        List<StationBasic> stationBasicListAll = new ArrayList<>();
+        List<StationBasic> fdzList = new ArrayList<>();
+        List<StationBasic> gfdzlist = new ArrayList<>();
+        if (!ObjectUtils.isEmpty(areaName)) {
+            stationBasicListAll = getListOfStationBasicByAreaName(areaName);
+        } else {
+            stationBasicListAll = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("station_name"));
+        }
+        String indicator = "日发电量";
+        if(tabValue.equals(1)){
+           indicator="月发电量";
+        }else{
+            indicator="年发电量";
+        }
+        //填写发电小时数
+        String finalIndicator = indicator;
+        stationBasicListAll.forEach(stationBasic -> {
+            Double install=getStationCaPACITYL(stationBasic.getStationNumber());
+            Double total =commonServiceImpl.getTotalByIndicatior(stationBasic.getFanGatewayId(), finalIndicator);
+            stationBasic.setAddress(String.format("%.2f",total));
+            if(stationBasic.getStationType().equals("FDZ")){
+                stationBasic.setAddress(String.format("%.2f",total/100/install));
+            }else {
+                stationBasic.setAddress(String.format("%.2f",total/1000000/install));
+            }
+            if(stationBasic.getAddress().equals("NaN")){
+                stationBasic.setAddress("0.00");
+            }
+        });
+        //分组并排序
+        fdzList = stationBasicListAll.stream().filter(stationBasic -> stationBasic.getStationType().equals("FDZ")).collect(Collectors.toList()).stream().sorted(Comparator.comparing(StationBasic::getAddress,Comparator.comparingDouble(Double::parseDouble)).reversed()).collect(Collectors.toList());
+        gfdzlist = stationBasicListAll.stream().filter(stationBasic -> !stationBasic.getStationType().equals("FDZ")).collect(Collectors.toList()).stream().sorted(Comparator.comparing(StationBasic::getAddress,Comparator.comparingDouble(Double::parseDouble)).reversed()).collect(Collectors.toList());
+        for (int i = 0; i <3 ; i++) {
+            HashMap<String,String> stringHashMap= new HashMap<>();
+            stringHashMap.put("sortNumber",String.valueOf(i+1));
+            StationBasic stationBasic =new StationBasic();
+            if(i<(fdzList.size())){
+                stationBasic = fdzList.get(i);
+                stringHashMap.put("stationName1",stationBasic.getStationName());
+                stringHashMap.put("hours1",stationBasic.getAddress()+"h");
+            }else {
+                stringHashMap.put("stationName1","");
+                stringHashMap.put("hours1","");
+            }
+            if(i<(gfdzlist.size())){
+                stationBasic = gfdzlist.get(i);
+                stringHashMap.put("stationName2",stationBasic.getStationName());
+                stringHashMap.put("hours2",stationBasic.getAddress()+"h");
+            }else {
+                stringHashMap.put("stationName2","");
+                stringHashMap.put("hours2","");
+            }
+            mapList.add(stringHashMap);
+        }
+        page.setRecords(mapList);
+        //组装数据
+        return page;
+    }
 }