作业指导知识、作业指导知识->安措内容、作业指导知识->危险点内容

web/knowledge-hb/src/main/java/com/gyee/knowledge/controller/auto/RiskprecController.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-17
+ */
+@RestController
+@RequestMapping("//riskprec")
+public class RiskprecController {
+
+}

web/knowledge-hb/src/main/java/com/gyee/knowledge/controller/auto/RisktypeController.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-17
+ */
+@RestController
+@RequestMapping("//risktype")
+public class RisktypeController {
+
+}

web/knowledge-hb/src/main/java/com/gyee/knowledge/controller/auto/SafeprecController.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-17
+ */
+@RestController
+@RequestMapping("//safeprec")
+public class SafeprecController {
+
+}

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

@@ -169,6 +169,78 @@ public class KnowledgeController {
 
     }
 
+    /**
+     * 作业指导知识
+     * @param name
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+
+    @GetMapping("/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
+    )  {
+
+        List<Risktype> resultlist = knowledgeService.workGuideKnowledge(name,pageNum,pageSize);
+        if (StringUtils.isNotNull(resultlist)) {
+            return R.ok(resultlist.size()).data(resultlist);
+        }else{
+            return R.error().message("访问失败");
+        }
+
+    }
+
+    /**
+     *作业指导知识->安措内容
+     * @param rsnum
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/workGuideKnowledge/safetyMeasure")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R safetyMeasure(@RequestParam(value = "rsnum",required = true) String rsnum,
+                                @RequestParam(value = "pageNum",required = true) String pageNum,
+                                @RequestParam(value = "pageSize",required = true) String pageSize
+    )  {
+
+        List<Safeprec> resultlist = knowledgeService.safetyMeasure(rsnum,pageNum,pageSize);
+        if (StringUtils.isNotNull(resultlist)) {
+            return R.ok(resultlist.size()).data(resultlist);
+        }else{
+            return R.error().message("访问失败");
+        }
+
+    }
+
+    /**
+     * 作业指导知识->危险点内容
+     * @param rsnum
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/workGuideKnowledge/dangerContent")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R dangerContent(@RequestParam(value = "rsnum",required = true) String rsnum,
+                           @RequestParam(value = "pageNum",required = true) String pageNum,
+                           @RequestParam(value = "pageSize",required = true) String pageSize
+    )  {
+
+        List<Riskprec> resultlist = knowledgeService.dangerContent(rsnum,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/RiskprecMapper.java

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

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

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

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

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

web/knowledge-hb/src/main/java/com/gyee/knowledge/model/auto/Riskprec.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-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("RISKPREC")
+public class Riskprec extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("ID")
+    private Long id;
+
+    @TableField("RSNUM")
+    private String rsnum;
+
+    @TableField("SERIALNUM")
+    private Long serialnum;
+
+    @TableField("TITLE")
+    private String title;
+
+    @TableField("DESCRIBE")
+    private String describe;
+
+    @TableField("ADDTIME")
+    private Date addtime;
+
+    @TableField("CONTENT")
+    private String content;
+
+    @TableField("PRINCIPAL")
+    private String principal;
+
+
+}

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

@@ -0,0 +1,61 @@
+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-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("RISKTYPE")
+public class Risktype extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("ID")
+    private Long id;
+
+    @TableField("RSNUM")
+    private String rsnum;
+
+    @TableField("SERIALNUM")
+    private Long serialnum;
+
+    @TableField("STATION")
+    private String station;
+
+    @TableField("LOCATION")
+    private String location;
+
+    @TableField("CONTENT")
+    private String content;
+
+    @TableField("DESCRIBE")
+    private String describe;
+
+    @TableField("PRINCIPAL")
+    private String principal;
+
+    @TableField("ADDTIME")
+    private Date addtime;
+
+    @TableField("ENDTIME")
+    private Date endtime;
+
+    @TableField("STATE")
+    private String state;
+
+
+}

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

@@ -0,0 +1,55 @@
+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-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("SAFEPREC")
+public class Safeprec extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("ID")
+    private Long id;
+
+    @TableField("RSNUM")
+    private String rsnum;
+
+    @TableField("SERIALNUM")
+    private Long serialnum;
+
+    @TableField("SAFECONTENT")
+    private String safecontent;
+
+    @TableField("DESCRIBE")
+    private String describe;
+
+    @TableField("FLAG")
+    private String flag;
+
+    @TableField("ADDTIME")
+    private Date addtime;
+
+    @TableField("COMPLETION")
+    private String completion;
+
+    @TableField("ISEXECUTE")
+    private String isexecute;
+
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -23,6 +23,12 @@ public class KnowledgeService {
     private IP3DeviceFeaturesService ip3DeviceFeaturesService;
     @Resource
     private ISafeprecstardService iSafeprecstardService;
+    @Resource
+    private IRisktypeService iRisktypeService;
+    @Resource
+    private ISafeprecService iSafeprecService;
+    @Resource
+    private IRiskprecService iRiskprecService;
 
 
     public List<P3DeviceFault> faultKnowledge(String gzjb, String tjlx, String cxnr, String pageNum, String pageSize) {
@@ -85,4 +91,33 @@ public class KnowledgeService {
         List<Safeprecstard> list = p3DeviceFaultPage.getRecords();
         return list;
     }
+
+    public List<Risktype> workGuideKnowledge(String name, String pageNum, String pageSize) {
+        QueryWrapper<Risktype> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(name)){
+            qw.like("content",name);
+        }
+        Page<Risktype> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        Page<Risktype> p3DeviceFaultPage = iRisktypeService.getBaseMapper().selectPage(page, qw);
+        List<Risktype> list = p3DeviceFaultPage.getRecords();
+        return list;
+    }
+
+    public List<Safeprec> safetyMeasure(String rsnum, String pageNum, String pageSize) {
+        QueryWrapper<Safeprec> qw = new QueryWrapper<>();
+            qw.eq("rsnum",rsnum);
+        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) {
+        QueryWrapper<Riskprec> qw = new QueryWrapper<>();
+        qw.eq("rsnum",rsnum);
+        Page<Riskprec> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        Page<Riskprec> p3DeviceFaultPage = iRiskprecService.getBaseMapper().selectPage(page, qw);
+        List<Riskprec> list = p3DeviceFaultPage.getRecords();
+        return list;
+    }
 }