特征参数、安全措施知识

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

@@ -0,0 +1,20 @@
+package com.gyee.knowledge.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-16
+ */
+@RestController
+@RequestMapping("//p3-device-features")
+public class P3DeviceFeaturesController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.knowledge.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-16
+ */
+@RestController
+@RequestMapping("//safeprecstard")
+public class SafeprecstardController {
+
+}

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

@@ -2,9 +2,7 @@ package com.gyee.knowledge.controller.knowledge;
 
 import com.gyee.common.model.StringUtils;
 import com.gyee.knowledge.config.R;
-import com.gyee.knowledge.model.auto.Alertrule2;
-import com.gyee.knowledge.model.auto.Alertrulefailure;
-import com.gyee.knowledge.model.auto.P3DeviceFault;
+import com.gyee.knowledge.model.auto.*;
 import com.gyee.knowledge.service.knowledge.KnowledgeService;
 import org.springframework.web.bind.annotation.*;
 
@@ -123,6 +121,54 @@ public class KnowledgeController {
 
     }
 
+    /**
+     * 特征参数
+     * @param name
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/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
+    )  {
+
+        List<P3DeviceFeatures> resultlist = knowledgeService.featureParameter(name,pageNum,pageSize);
+        if (StringUtils.isNotNull(resultlist)) {
+            return R.ok(resultlist.size()).data(resultlist);
+        }else{
+            return R.error().message("访问失败");
+        }
+
+    }
+
+    /**
+     * 安全措施知识
+     * @param name
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/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
+    )  {
+
+        List<Safeprecstard> resultlist = knowledgeService.safeMeasureKnowledge(name,pageNum,pageSize);
+        if (StringUtils.isNotNull(resultlist)) {
+            return R.ok(resultlist.size()).data(resultlist);
+        }else{
+            return R.error().message("访问失败");
+        }
+
+    }
+
 
 
 }

web/knowledge-hb/src/main/java/com/gyee/knowledge/mapper/auto/P3DeviceFeaturesMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.knowledge.mapper.auto;
+
+import com.gyee.knowledge.model.auto.P3DeviceFeatures;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-16
+ */
+public interface P3DeviceFeaturesMapper extends BaseMapper<P3DeviceFeatures> {
+
+}

web/knowledge-hb/src/main/java/com/gyee/knowledge/mapper/auto/SafeprecstardMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.knowledge.mapper.auto;
+
+import com.gyee.knowledge.model.auto.Safeprecstard;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-16
+ */
+public interface SafeprecstardMapper extends BaseMapper<Safeprecstard> {
+
+}

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

@@ -38,7 +38,7 @@ public class Alertrulefailure extends Model {
     private String gqj;
 
     @TableField("XQSC")
-    private BigDecimal xqsc;
+    private Integer xqsc;
 
     @TableField("NAME")
     private String name;

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

@@ -0,0 +1,83 @@
+package com.gyee.knowledge.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("P3_DEVICE_FEATURES")
+public class P3DeviceFeatures extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("ID")
+    private Long id;
+
+    @TableField("MODELID")
+    private String modelid;
+
+    @TableField("STRUCTUREID")
+    private Integer structureid;
+
+    @TableField("COMPONENTID")
+    private Integer componentid;
+
+    @TableField("UNIFORMCODE")
+    private String uniformcode;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("DESCRIPTION")
+    private String description;
+
+    @TableField("MINVALUE")
+    private Integer minvalue;
+
+    @TableField("MAXVALUE")
+    private Integer maxvalue;
+
+    @TableField("NORMALMIN")
+    private Integer normalmin;
+
+    @TableField("NORMALMAX")
+    private Integer normalmax;
+
+    @TableField("PREALERTVALUE")
+    private Integer prealertvalue;
+
+    @TableField("ALERTVALUE")
+    private Integer alertvalue;
+
+    @TableField("ENABLED")
+    private Integer enabled;
+
+    @TableField("CREATOR")
+    private String creator;
+
+    @TableField("CREATETIME")
+    private Date createtime;
+
+    @TableField("LASTUPDATEPERSON")
+    private String lastupdateperson;
+
+    @TableField("LASTUPDATETIME")
+    private Date lastupdatetime;
+
+
+}

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

@@ -0,0 +1,52 @@
+package com.gyee.knowledge.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("SAFEPRECSTARD")
+public class Safeprecstard extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("ID")
+    private Long id;
+
+    @TableField("SERIALNUM")
+    private Long serialnum;
+
+    @TableField("SAFECONTENT")
+    private String safecontent;
+
+    @TableField("DESCRIBE")
+    private String describe;
+
+    @TableField("PRINCIPAL")
+    private String principal;
+
+    @TableField("ADDTIME")
+    private Date addtime;
+
+    @TableField("TYPE")
+    private String type;
+
+    @TableField("OTHER")
+    private String other;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.knowledge.service.auto;
+
+import com.gyee.knowledge.model.auto.P3DeviceFeatures;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-16
+ */
+public interface IP3DeviceFeaturesService extends IService<P3DeviceFeatures> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.knowledge.service.auto;
+
+import com.gyee.knowledge.model.auto.Safeprecstard;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-16
+ */
+public interface ISafeprecstardService extends IService<Safeprecstard> {
+
+}

web/knowledge-hb/src/main/java/com/gyee/knowledge/service/auto/impl/P3DeviceFeaturesServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.knowledge.service.auto.impl;
+
+import com.gyee.knowledge.model.auto.P3DeviceFeatures;
+import com.gyee.knowledge.mapper.auto.P3DeviceFeaturesMapper;
+import com.gyee.knowledge.service.auto.IP3DeviceFeaturesService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-16
+ */
+@Service
+public class P3DeviceFeaturesServiceImpl extends ServiceImpl<P3DeviceFeaturesMapper, P3DeviceFeatures> implements IP3DeviceFeaturesService {
+
+}

web/knowledge-hb/src/main/java/com/gyee/knowledge/service/auto/impl/SafeprecstardServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.knowledge.service.auto.impl;
+
+import com.gyee.knowledge.model.auto.Safeprecstard;
+import com.gyee.knowledge.mapper.auto.SafeprecstardMapper;
+import com.gyee.knowledge.service.auto.ISafeprecstardService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-16
+ */
+@Service
+public class SafeprecstardServiceImpl extends ServiceImpl<SafeprecstardMapper, Safeprecstard> implements ISafeprecstardService {
+
+}

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

@@ -3,12 +3,8 @@ package com.gyee.knowledge.service.knowledge;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.common.model.StringUtils;
-import com.gyee.knowledge.model.auto.Alertrule2;
-import com.gyee.knowledge.model.auto.Alertrulefailure;
-import com.gyee.knowledge.model.auto.P3DeviceFault;
-import com.gyee.knowledge.service.auto.IAlertrule2Service;
-import com.gyee.knowledge.service.auto.IAlertrulefailureService;
-import com.gyee.knowledge.service.auto.IP3DeviceFaultService;
+import com.gyee.knowledge.model.auto.*;
+import com.gyee.knowledge.service.auto.*;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -23,6 +19,10 @@ public class KnowledgeService {
     private IAlertrule2Service iAlertrule2Service;
     @Resource
     private IAlertrulefailureService iAlertrulefailureService;
+    @Resource
+    private IP3DeviceFeaturesService ip3DeviceFeaturesService;
+    @Resource
+    private ISafeprecstardService iSafeprecstardService;
 
 
     public List<P3DeviceFault> faultKnowledge(String gzjb, String tjlx, String cxnr, String pageNum, String pageSize) {
@@ -63,4 +63,26 @@ public class KnowledgeService {
     public List<String> modelList() {
         return iAlertrulefailureService.list().stream().map(i->i.getModel()).distinct().collect(Collectors.toList());
     }
+
+    public List<P3DeviceFeatures> featureParameter(String name, String pageNum, String pageSize) {
+        QueryWrapper<P3DeviceFeatures> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(name)){
+            qw.like("name",name);
+        }
+        Page<P3DeviceFeatures> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        Page<P3DeviceFeatures> p3DeviceFaultPage = ip3DeviceFeaturesService.getBaseMapper().selectPage(page, qw);
+        List<P3DeviceFeatures> list = p3DeviceFaultPage.getRecords();
+        return list;
+    }
+
+    public List<Safeprecstard> safeMeasureKnowledge(String name, String pageNum, String pageSize) {
+        QueryWrapper<Safeprecstard> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(name)){
+            qw.like("safecontent",name);
+        }
+        Page<Safeprecstard> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        Page<Safeprecstard> p3DeviceFaultPage = iSafeprecstardService.getBaseMapper().selectPage(page, qw);
+        List<Safeprecstard> list = p3DeviceFaultPage.getRecords();
+        return list;
+    }
 }