新增知识管理消费接口

common/src/main/java/com/gyee/common/vo/analysis/DeskObject.java

@@ -14,6 +14,6 @@ import java.util.Date;
 @Data
 public class DeskObject implements Serializable {
     private static final long serialVersionUID = 1417345510455672010L;
-    private Date date;
+    private Long date;
     private String name;
 }

web/analysis-web-hb/src/main/java/com/gyee/analysis/service/AnalysisNewService.java

@@ -143,7 +143,7 @@ public class AnalysisNewService {
         });
         //---------------------------倍率赋值开始-----------------------------
         DeskObject blObject = new DeskObject();
-        blObject.setDate(DateUtils.parseDate(theday));
+        blObject.setDate(DateUtils.parseDate(theday).getTime());
         blObject.setName("倍率");
         try {
             LinkedHashMap addMap = new LinkedHashMap();
@@ -162,7 +162,7 @@ public class AnalysisNewService {
 
         //---------------------------起码赋值开始-----------------------------
         DeskObject qmObject = new DeskObject();
-        qmObject.setDate(DateUtils.parseDate(theday));
+        qmObject.setDate(DateUtils.parseDate(theday).getTime());
         qmObject.setName("起码");
 
         QueryWrapper<Analysissubtablebottom> queryYestmonth = new QueryWrapper<>();
@@ -188,7 +188,7 @@ public class AnalysisNewService {
 
 
         DeskObject zmObject = new DeskObject();
-        zmObject.setDate(DateUtils.parseDate(theday));
+        zmObject.setDate(DateUtils.parseDate(theday).getTime());
         zmObject.setName("止码");
 
 
@@ -209,7 +209,7 @@ public class AnalysisNewService {
         //-------------------------------电量赋值开始-------------------------------------------
 
         DeskObject dlObject = new DeskObject();
-        dlObject.setDate(DateUtils.parseDate(theday));
+        dlObject.setDate(DateUtils.parseDate(theday).getTime());
         dlObject.setName("电量");
 
         try {

web/analysis-web-hb/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,5 +1,4 @@
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\service\auto\IAnalysissubprojectwindcanService.java
-D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\util\DynamicBean.java
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\controller\AnalysiswindtargetController.java
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\config\GeneratorCodeConfig.java
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\service\auto\IAnalysissubprojectpvcannotService.java
@@ -26,7 +25,6 @@ D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\ini
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\model\auto\Analysissubtablebottom.java
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\config\MybatisPlusConfig.java
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\model\auto\Analysismain.java
-D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\util\ClassUtil.java
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\model\auto\Analysissubprojectwindcan.java
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\service\auto\impl\WindpowerstationServiceImpl.java
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\mapper\auto\AnalysiswindtargetMapper.java
@@ -51,7 +49,6 @@ D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\con
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\service\auto\impl\AnalysissubprojectwindcannotServiceImpl.java
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\service\auto\impl\ProjectServiceImpl.java
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\service\auto\impl\AnalysissubprojectpvcannotServiceImpl.java
-D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\util\DeskObject.java
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\config\R.java
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\config\ResultInfo.java
 D:\work\ideawork\sis\sis\web\analysis-web-hb\src\main\java\com\gyee\analysis\mapper\auto\AnalysissubprojectwindcannotMapper.java

web/consumer/src/main/java/com/gyee/consumer/controller/knowleage/KnowleageController.java

@@ -0,0 +1,221 @@
+package com.gyee.consumer.controller.knowleage;
+
+import com.gyee.common.config.R;
+import com.gyee.common.model.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @ClassName : KnowleageController
+ * @Author : xieshengjie
+ * @Date: 2022/2/18 15:12
+ * @Description :
+ */
+@RestController
+public class KnowleageController {
+
+
+    @Value("${url.knowleage}")
+    private String  KNOWLEAGE_URL;
+
+    @Resource
+    private RestTemplate restTemplate;
+
+    /**
+     * 故障知识列表
+     * @param gzjb
+     * @param tjlx
+     * @param cxnr
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/consumer/knowledge/faultKnowledge")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R faultKnowledge(@RequestParam(value = "gzjb",required = true) String gzjb,
+                            @RequestParam(value = "tjlx",required = true) String tjlx,
+                            @RequestParam(value = "cxnr",required = true) String cxnr,
+                            @RequestParam(value = "pageNum",required = true) String pageNum,
+                            @RequestParam(value = "pageSize",required = true) String pageSize
+    )  {
+        return restTemplate.getForObject(KNOWLEAGE_URL+"/knowledge/faultKnowledge?gzjb="+gzjb+"&tjlx="+tjlx+"&cxnr="+cxnr+"&pageNum="+pageNum+"&pageSize="+pageSize,R.class);
+    }
+
+
+    /**
+     * 预警知识
+     * @param gzjb
+     * @param bjlx
+     * @param cxnr
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/consumer/knowledge/earlyKnowledge")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R earlyKnowledge(@RequestParam(value = "gzjb",required = true) String gzjb,
+                            @RequestParam(value = "bjlx",required = true) String bjlx,
+                            @RequestParam(value = "cxnr",required = true) String cxnr,
+                            @RequestParam(value = "pageNum",required = true) String pageNum,
+                            @RequestParam(value = "pageSize",required = true) String pageSize
+    )  {
+        return restTemplate.getForObject(KNOWLEAGE_URL+"/knowledge/earlyKnowledge?gzjb="+gzjb+"&bjlx="+bjlx+"&cxnr="+cxnr+"&pageNum="+pageNum+"&pageSize="+pageSize,R.class);
+    }
+
+
+    /**
+     * 检查修理方案
+     * @param model
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/consumer/knowledge/checkRepairProgramme")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R checkRepairProgramme(@RequestParam(value = "model",required = true) String model,
+                                  @RequestParam(value = "pageNum",required = true) String pageNum,
+                                  @RequestParam(value = "pageSize",required = true) String pageSize
+    )  {
+
+        return restTemplate.getForObject(KNOWLEAGE_URL+"/knowledge/checkRepairProgramme?model="+model+"&pageNum="+pageNum+"&pageSize="+pageSize,R.class);
+
+    }
+
+
+    /**
+     * 检查修理方案型号list
+     * @return
+     */
+    @GetMapping("/consumer/knowledge/modelList")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R modelList()  {
+
+
+        return restTemplate.getForObject(KNOWLEAGE_URL+"/knowledge/modelList",R.class);
+
+
+    }
+
+    /**
+     * 特征参数
+     * @param name
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/consumer/knowledge/featureParameter")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R featureParameter(@RequestParam(value = "name",required = true) String name,
+                              @RequestParam(value = "pageNum",required = true) String pageNum,
+                              @RequestParam(value = "pageSize",required = true) String pageSize
+    )  {
+
+        return restTemplate.getForObject(KNOWLEAGE_URL+"/knowledge/featureParameter?name="+name+"&pageNum="+pageNum+"&pageSize="+pageSize,R.class);
+
+    }
+
+    /**
+     * 安全措施知识
+     * @param name
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/consumer/knowledge/safeMeasureKnowledge")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R safeMeasureKnowledge(@RequestParam(value = "safecontent",required = true) String name,
+                                  @RequestParam(value = "pageNum",required = true) String pageNum,
+                                  @RequestParam(value = "pageSize",required = true) String pageSize
+    )  {
+
+        return restTemplate.getForObject(KNOWLEAGE_URL+"/knowledge/safeMeasureKnowledge?safecontent="+name+"&pageNum="+pageNum+"&pageSize="+pageSize,R.class);
+
+
+    }
+
+
+    /**
+     * 作业指导知识
+     * @param name
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+
+    @GetMapping("/consumer/knowledge/workGuideKnowledge")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R workGuideKnowledge(@RequestParam(value = "content",required = true) String name,
+                                @RequestParam(value = "pageNum",required = true) String pageNum,
+                                @RequestParam(value = "pageSize",required = true) String pageSize
+    )  {
+        return restTemplate.getForObject(KNOWLEAGE_URL+"/knowledge/workGuideKnowledge?content="+name+"&pageNum="+pageNum+"&pageSize="+pageSize,R.class);
+    }
+
+    /**
+     *作业指导知识->安措内容
+     * @param rsnum
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/consumer/knowledge/workGuideKnowledge/safetyMeasure")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R safetyMeasure(@RequestParam(value = "rsnum",required = false) String rsnum,
+                           @RequestParam(value = "content",required = false) String content,
+                           @RequestParam(value = "pageNum",required = true) String pageNum,
+                           @RequestParam(value = "pageSize",required = true) String pageSize
+    )  {
+        String url = KNOWLEAGE_URL+"/knowledge/workGuideKnowledge/safetyMeasure?&pageNum="+pageNum+"&pageSize="+pageSize;
+
+        if (StringUtils.isNotEmpty(rsnum)){
+            url = url + "&rsnum="+rsnum;
+        }
+        if (StringUtils.isNotEmpty(content)){
+            url = url + "&content="+content;
+        }
+
+        return restTemplate.getForObject(url,R.class);
+
+
+    }
+    /**
+     * 作业指导知识->危险点内容
+     * @param rsnum
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/consumer/knowledge/workGuideKnowledge/dangerContent")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R dangerContent(@RequestParam(value = "rsnum",required = false) String rsnum,
+                           @RequestParam(value = "content",required = false) String content,
+                           @RequestParam(value = "pageNum",required = true) String pageNum,
+                           @RequestParam(value = "pageSize",required = true) String pageSize
+    )  {
+        String url = KNOWLEAGE_URL+"/knowledge/workGuideKnowledge/dangerContent?&pageNum="+pageNum+"&pageSize="+pageSize;
+
+        if (StringUtils.isNotEmpty(rsnum)){
+            url = url + "&rsnum="+rsnum;
+        }
+        if (StringUtils.isNotEmpty(content)){
+            url = url + "&content="+content;
+        }
+
+        return restTemplate.getForObject(url,R.class);
+
+
+    }
+}

web/consumer/src/main/resources/application.yml

@@ -83,5 +83,6 @@ logging:
 url:
   benchmaring: http://192.168.2.216:8081
   analysis: http://192.168.2.216:8082
+  knowleage: http://192.168.2.216:8086
 
 

web/consumer/target/classes/application.yml

@@ -83,5 +83,6 @@ logging:
 url:
   benchmaring: http://192.168.2.216:8081
   analysis: http://192.168.2.216:8082
+  knowleage: http://192.168.2.216:8086
 
 

web/knowledge-hb/src/main/java/com/gyee/knowledge/controller/knowledge/KnowledgeController.java

@@ -204,12 +204,13 @@ public class KnowledgeController {
     @GetMapping("/workGuideKnowledge/safetyMeasure")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
-    public R safetyMeasure(@RequestParam(value = "rsnum",required = true) String rsnum,
+    public R safetyMeasure(@RequestParam(value = "rsnum",required = false) String rsnum,
+                           @RequestParam(value = "content",required = false) String content,
                                 @RequestParam(value = "pageNum",required = true) String pageNum,
                                 @RequestParam(value = "pageSize",required = true) String pageSize
     )  {
 
-        List<Safeprec> resultlist = knowledgeService.safetyMeasure(rsnum,pageNum,pageSize);
+        List<Safeprec> resultlist = knowledgeService.safetyMeasure(rsnum,content,pageNum,pageSize);
         if (StringUtils.isNotNull(resultlist)) {
             return R.ok(resultlist.size()).data(resultlist);
         }else{
@@ -228,12 +229,13 @@ public class KnowledgeController {
     @GetMapping("/workGuideKnowledge/dangerContent")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
-    public R dangerContent(@RequestParam(value = "rsnum",required = true) String rsnum,
+    public R dangerContent(@RequestParam(value = "rsnum",required = false) String rsnum,
+                           @RequestParam(value = "content",required = false) String content,
                            @RequestParam(value = "pageNum",required = true) String pageNum,
                            @RequestParam(value = "pageSize",required = true) String pageSize
     )  {
 
-        List<Riskprec> resultlist = knowledgeService.dangerContent(rsnum,pageNum,pageSize);
+        List<Riskprec> resultlist = knowledgeService.dangerContent(rsnum,content,pageNum,pageSize);
         if (StringUtils.isNotNull(resultlist)) {
             return R.ok(resultlist.size()).data(resultlist);
         }else{

web/knowledge-hb/src/main/java/com/gyee/knowledge/model/auto/Alertrulefailure.java

@@ -1,6 +1,8 @@
 package com.gyee.knowledge.model.auto;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -22,7 +24,7 @@ public class Alertrulefailure extends Model {
 
     private static final long serialVersionUID = 1L;
 
-    @TableField("ID")
+    @TableId
     private String id;
 
     @TableField("TID")

web/knowledge-hb/src/main/java/com/gyee/knowledge/model/auto/P3DeviceFault.java

@@ -1,6 +1,8 @@
 package com.gyee.knowledge.model.auto;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
@@ -26,7 +28,7 @@ public class P3DeviceFault extends Model {
 
     private static final long serialVersionUID = 1L;
 
-    @TableField("ID")
+    @TableId("ID")
     private String id;
 
     @TableField("CODE")

web/knowledge-hb/src/main/java/com/gyee/knowledge/model/auto/P3DeviceFeatures.java

@@ -1,6 +1,8 @@
 package com.gyee.knowledge.model.auto;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
@@ -25,7 +27,7 @@ public class P3DeviceFeatures extends Model {
 
     private static final long serialVersionUID = 1L;
 
-    @TableField("ID")
+    @TableId("ID")
     private Long id;
 
     @TableField("MODELID")

web/knowledge-hb/src/main/java/com/gyee/knowledge/model/auto/Riskprec.java

@@ -1,5 +1,6 @@
 package com.gyee.knowledge.model.auto;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
@@ -24,7 +25,7 @@ public class Riskprec extends Model {
 
     private static final long serialVersionUID = 1L;
 
-    @TableField("ID")
+    @TableId("ID")
     private Long id;
 
     @TableField("RSNUM")

web/knowledge-hb/src/main/java/com/gyee/knowledge/model/auto/Risktype.java

@@ -1,5 +1,6 @@
 package com.gyee.knowledge.model.auto;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
@@ -24,7 +25,7 @@ public class Risktype extends Model {
 
     private static final long serialVersionUID = 1L;
 
-    @TableField("ID")
+    @TableId("ID")
     private Long id;
 
     @TableField("RSNUM")

web/knowledge-hb/src/main/java/com/gyee/knowledge/model/auto/Safeprec.java

@@ -1,5 +1,6 @@
 package com.gyee.knowledge.model.auto;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
@@ -24,7 +25,7 @@ public class Safeprec extends Model {
 
     private static final long serialVersionUID = 1L;
 
-    @TableField("ID")
+    @TableId("ID")
     private Long id;
 
     @TableField("RSNUM")

web/knowledge-hb/src/main/java/com/gyee/knowledge/model/auto/Safeprecstard.java

@@ -1,5 +1,6 @@
 package com.gyee.knowledge.model.auto;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
@@ -24,7 +25,7 @@ public class Safeprecstard extends Model {
 
     private static final long serialVersionUID = 1L;
 
-    @TableField("ID")
+    @TableId("ID")
     private Long id;
 
     @TableField("SERIALNUM")

web/knowledge-hb/src/main/java/com/gyee/knowledge/model/auto/Testmis.java

@@ -1,5 +1,6 @@
 package com.gyee.knowledge.model.auto;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -21,7 +22,7 @@ public class Testmis extends Model {
 
     private static final long serialVersionUID = 1L;
 
-    @TableField("ID")
+    @TableId("ID")
     private String id;
 
     @TableField("NAME")

web/knowledge-hb/src/main/java/com/gyee/knowledge/service/knowledge/KnowledgeService.java

@@ -103,18 +103,28 @@ public class KnowledgeService {
         return list;
     }
 
-    public List<Safeprec> safetyMeasure(String rsnum, String pageNum, String pageSize) {
+    public List<Safeprec> safetyMeasure(String rsnum, String content,String pageNum, String pageSize) {
         QueryWrapper<Safeprec> qw = new QueryWrapper<>();
-            qw.eq("rsnum",rsnum);
+        if (StringUtils.isNotEmpty(rsnum)){
+            qw.like("rsnum",rsnum);
+        }
+        if (StringUtils.isNotEmpty(content)){
+            qw.like("safecontent",content);
+        }
         Page<Safeprec> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         Page<Safeprec> p3DeviceFaultPage = iSafeprecService.getBaseMapper().selectPage(page, qw);
         List<Safeprec> list = p3DeviceFaultPage.getRecords();
         return list;
     }
 
-    public List<Riskprec> dangerContent(String rsnum, String pageNum, String pageSize) {
+    public List<Riskprec> dangerContent(String rsnum, String content, String pageNum, String pageSize) {
         QueryWrapper<Riskprec> qw = new QueryWrapper<>();
-        qw.eq("rsnum",rsnum);
+        if (StringUtils.isNotEmpty(rsnum)){
+            qw.like("rsnum",rsnum);
+        }
+        if (StringUtils.isNotEmpty(content)){
+            qw.like("describe",content);
+        }
         Page<Riskprec> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         Page<Riskprec> p3DeviceFaultPage = iRiskprecService.getBaseMapper().selectPage(page, qw);
         List<Riskprec> list = p3DeviceFaultPage.getRecords();

web/knowledge-hb/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8024
+  port: 8086
   servlet:
     context-path: /
 

web/knowledge-hb/src/main/resources/application-test.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8024
+  port: 8086
   servlet:
     context-path: /
 

web/knowledge-hb/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-#    active: dev
-    active: test
+    active: dev
+#    active: test

web/knowledge-hb/target/classes/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8024
+  port: 8086
   servlet:
     context-path: /
 

web/knowledge-hb/target/classes/application-test.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8024
+  port: 8086
   servlet:
     context-path: /
 

web/knowledge-hb/target/classes/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-#    active: dev
-    active: test
+    active: dev
+#    active: test