Merge branch 'master' of http://124.70.43.205:3000/xieshengjie/sis

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/ProEconCleaningInputController.java

@@ -7,6 +7,7 @@ import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProEconCleaningInput;
 import com.gyee.runeconomy.service.auto.IProEconCleaningInputService;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -42,8 +43,8 @@ public class ProEconCleaningInputController {
     @ApiOperation(value = "清洗录入-列表", notes = "清洗录入-列表")
     public R findList(@RequestParam(value = "windpowerstationId", required = false) String windpowerstationId,
                       @RequestParam(value = "windpowerstationName", required = false) String windpowerstationName,
-                      @RequestParam(value = "begindate", required = false) Date begindate,
-                      @RequestParam(value = "planEnddate", required = false) Date planEnddate,
+                      @RequestParam(value = "begindate", required = false) String begindate,
+                      @RequestParam(value = "planEnddate", required = false) String planEnddate,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
         IPage<ProEconCleaningInput> list = proEconCleaningInputService.getList(windpowerstationId, windpowerstationName, begindate, planEnddate, pageNum, pageSize);
@@ -65,7 +66,7 @@ public class ProEconCleaningInputController {
 
         boolean b = proEconCleaningInputService.saveOrUpdate(ProEconCleaningInput);
         if (b) {
-            CacheContext.initPowerstationList();
+//            CacheContext.initPowerstationList();
             return R.ok().data(b);
         } else {
             return R.error().data("保存失败！");
@@ -84,7 +85,7 @@ public class ProEconCleaningInputController {
         String[] strings = ids.split(",");
         boolean b = proEconCleaningInputService.removeByIds(Arrays.asList(strings));
         if (b) {
-            CacheContext.initPowerstationList();
+//            CacheContext.initPowerstationList();
             return R.ok().data(b);
         } else {
             return R.error().data("删除失败！");

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/ProEconFaultFaultController.java

@@ -6,6 +6,7 @@ import com.gyee.common.config.R;
 import com.gyee.runeconomy.model.auto.ProEconFaultFault;
 import com.gyee.runeconomy.service.auto.IProEconFaultFaultService;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -40,8 +41,8 @@ public class ProEconFaultFaultController {
     @ApiOperation(value = "清洗录入-列表", notes = "清洗录入-列表")
     public R findList(@RequestParam(value = "windpowerstationId", required = false) String windpowerstationId,
                       @RequestParam(value = "windpowerstationName", required = false) String windpowerstationName,
-                      @RequestParam(value = "begindate", required = false) Date begindate,
-                      @RequestParam(value = "planEnddate", required = false) Date planEnddate,
+                      @RequestParam(value = "begindate", required = false) String begindate,
+                      @RequestParam(value = "planEnddate", required = false) String planEnddate,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
         IPage<ProEconFaultFault> list = proEconFaultFaultService.getList(windpowerstationId, windpowerstationName, begindate, planEnddate, pageNum, pageSize);

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/model/auto/ProEconCleaningInput.java

@@ -1,10 +1,12 @@
 package com.gyee.runeconomy.model.auto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -22,10 +24,12 @@ public class ProEconCleaningInput extends Model {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private String id;
     /**
      * 场站编号
      */
-    @TableId(value = "windpowerstation_id")
+
     private String windpowerstationId;
 
     /**
@@ -46,19 +50,19 @@ public class ProEconCleaningInput extends Model {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date begindate;
 
     /**
      * 计划结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date planEnddate;
 
     /**
      * 实际结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date actualEnddate;
 
     /**

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/model/auto/ProEconFaultFault.java

@@ -1,5 +1,6 @@
 package com.gyee.runeconomy.model.auto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -22,10 +23,11 @@ public class ProEconFaultFault extends Model {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private String id;
     /**
      * 场站编号
      */
-    @TableId(value = "windpowerstation_id")
     private String windpowerstationId;
 
     /**
@@ -46,19 +48,19 @@ public class ProEconFaultFault extends Model {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date begindate;
 
     /**
      * 计划结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date planEnddate;
 
     /**
      * 实际结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date actualEnddate;
 
     /**

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/IProEconCleaningInputService.java

@@ -16,6 +16,6 @@ import java.util.Date;
  */
 public interface IProEconCleaningInputService extends IService<ProEconCleaningInput> {
 
-    IPage<ProEconCleaningInput> getList(String windpowerstationId, String windpowerstationName, Date begindate, Date planEnddate, String pageNum, String pageSize);
+    IPage<ProEconCleaningInput> getList(String windpowerstationId, String windpowerstationName, String begindate, String planEnddate, String pageNum, String pageSize);
 
 }

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/IProEconFaultFaultService.java

@@ -15,6 +15,6 @@ import java.util.Date;
  * @since 2023-07-05
  */
 public interface IProEconFaultFaultService extends IService<ProEconFaultFault> {
-    IPage<ProEconFaultFault> getList(String windpowerstationId, String windpowerstationName, Date begindate, Date planEnddate, String pageNum, String pageSize);
+    IPage<ProEconFaultFault> getList(String windpowerstationId, String windpowerstationName, String begindate, String planEnddate, String pageNum, String pageSize);
 
 }

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconCleaningInputServiceImpl.java

@@ -8,8 +8,11 @@ import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.mapper.auto.ProEconCleaningInputMapper;
 import com.gyee.runeconomy.model.auto.ProEconCleaningInput;
 import com.gyee.runeconomy.service.auto.IProEconCleaningInputService;
+import com.gyee.runeconomy.util.DateUtils;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
@@ -24,9 +27,11 @@ import java.util.Date;
 public class ProEconCleaningInputServiceImpl extends ServiceImpl<ProEconCleaningInputMapper, ProEconCleaningInput> implements IProEconCleaningInputService {
 
     @Override
-    public IPage<ProEconCleaningInput> getList(String windpowerstationId, String windpowerstationName, Date begindate, Date planEnddate, String pageNum, String pageSize) {
+    public IPage<ProEconCleaningInput> getList(String windpowerstationId, String windpowerstationName, String begindate, String planEnddate, String pageNum, String pageSize) {
         QueryWrapper<ProEconCleaningInput> qw = new QueryWrapper<>();
 
+
+
         if (StringUtils.isNotEmpty(windpowerstationId)){
             qw.eq("windpowerstation_id",windpowerstationId);
         }
@@ -35,17 +40,27 @@ public class ProEconCleaningInputServiceImpl extends ServiceImpl<ProEconCleaning
             qw.like("windpowerstation_name",windpowerstationName);
         }
 
-        if (begindate != null){
-            qw.like("begindate",begindate);
+        if (StringUtils.isNotEmpty(begindate)){
+            try {
+                Date beginDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(begindate);
+                qw.ge("begindate", beginDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
         }
 
-        if (planEnddate != null){
-            qw.eq("plan_enddate",planEnddate);
+        if (StringUtils.isNotEmpty(planEnddate)){
+            try {
+                Date endDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(planEnddate);
+                qw.le("plan_enddate", endDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
         }
 
         Page<ProEconCleaningInput> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         IPage<ProEconCleaningInput> InputPage = getBaseMapper().selectPage(page, qw);
-//        List<Windpowerstation> list = companysPage.getRecords();
+
         return InputPage;
     }
 }

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconFaultFaultServiceImpl.java

@@ -10,6 +10,8 @@ import com.gyee.runeconomy.model.auto.ProEconFaultFault;
 import com.gyee.runeconomy.service.auto.IProEconFaultFaultService;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
@@ -24,7 +26,7 @@ import java.util.Date;
 public class ProEconFaultFaultServiceImpl extends ServiceImpl<ProEconFaultFaultMapper, ProEconFaultFault> implements IProEconFaultFaultService {
 
     @Override
-    public IPage<ProEconFaultFault> getList(String windpowerstationId, String windpowerstationName, Date begindate, Date planEnddate, String pageNum, String pageSize) {
+    public IPage<ProEconFaultFault> getList(String windpowerstationId, String windpowerstationName, String begindate, String planEnddate, String pageNum, String pageSize) {
         QueryWrapper<ProEconFaultFault> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(windpowerstationId)){
@@ -35,12 +37,22 @@ public class ProEconFaultFaultServiceImpl extends ServiceImpl<ProEconFaultFaultM
             qw.like("windpowerstation_name",windpowerstationName);
         }
 
-        if (begindate != null){
-            qw.like("begindate",begindate);
+        if (StringUtils.isNotEmpty(begindate)){
+            try {
+                Date beginDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(begindate);
+                qw.ge("begindate", beginDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
         }
 
-        if (planEnddate != null){
-            qw.eq("plan_enddate",planEnddate);
+        if (StringUtils.isNotEmpty(planEnddate)){
+            try {
+                Date endDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(planEnddate);
+                qw.le("plan_enddate", endDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
         }
 
         Page<ProEconFaultFault> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -117,7 +117,7 @@ public class BenchmarkingService {
 
     public List<ProBasicOrganizeEquipment> wtByWplist(String wpids) {
         return CacheContext.organizeEquipmentList.stream().filter(
-                oe -> wpids.contains(oe.getWindpowerstationId()) && (oe.getNemName().contains("逆变器") || oe.getNemName().contains("风机"))).collect(Collectors.toList());
+                oe -> wpids.contains(oe.getWindpowerstationId()) &&  !oe.getParentCode().endsWith("AG") && (oe.getNemName().contains("逆变器")  || oe.getNemName().contains("风机"))).collect(Collectors.toList());
     }
 
     public List<ProBasicOrganizeEquipment> wtByWplistxin(String wpids) {