工程质量数据分析接口

securitycontrol-auth/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server: 
-  port: 13031
+  port: 33031
 management:
   server:
     port: -1
@@ -16,17 +16,17 @@ spring:
   cloud:
     nacos:
       username: nacos
-     # password: nacos
+      password: nacos
-      password: Jjsp@nacos2023
+      #password: Jjsp@nacos2023
       discovery:
         # 服务注册地址
-       # server-addr: 192.168.0.14:8848
+        server-addr: 192.168.0.14:8848
-        server-addr: 127.0.0.1:18848
+       # server-addr: 127.0.0.1:18848
        # server-addr: 127.0.0.1:8848
         namespace: jjzhgd
       config:
-      #  server-addr: 192.168.0.14:8848
+        server-addr: 192.168.0.14:8848
-        server-addr: 127.0.0.1:18848
+      #  server-addr: 127.0.0.1:18848
    #     server-addr: 127.0.0.1:8848
         namespace: jjzhgd
         # 配置文件格式

securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjProjectQualityVo.java

@@ -0,0 +1,62 @@
+package com.securitycontrol.entity.background.vo;
+
+import lombok.Data;
+
+@Data
+public class SjProjectQualityVo {
+    // 主键
+    private String id;
+     //工程类型
+    private String proType;
+
+    // 工程结构划分
+    private String proStructure;
+
+    //总验收项
+    private String totalItem;
+
+    //已验收项
+    private String acceptItem;
+    //已填验收表数量
+    private String acceptTable;
+
+    //已填合格验收表数量
+    private String acceptQualifiedTable;
+    //验收率
+    private String acceptRate;
+
+    //验收填报准确率
+    private String acceptTbRate;
+
+    //主设备试验调试通过数量
+    private String mainAcceptNum;
+
+
+    //主设备试验调试一次通过数量
+    private String mainOneAcceptNum;
+
+    //主设备试验调试一次通过率
+    private String mainAcceptRate;
+
+    //系统投运通过数量
+    private String commAccept;
+
+    //系统投运一次通过数量
+    private String commOneAccept;
+    //系统投运一次通过率
+    private String commAcceptRate;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

securitycontrol-gateway/pom.xml

@@ -21,6 +21,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
+            <version>4.2.5</version>
         </dependency>
         <dependency>
             <groupId>com.github.ulisesbocchio</groupId>

securitycontrol-gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 13030
+  port: 18080
   servlet:
     context-path: zhgd
 # Spring
@@ -16,8 +16,8 @@ spring:
   cloud:
     nacos:
       username: nacos
+    #  password: nacos
       password: Jjsp@nacos2023
-    #  password: Jjsp@nacos2023
       discovery:
         # 服务注册地址
         server-addr: 127.0.0.1:18848
@@ -27,10 +27,8 @@ spring:
         namespace: jjzhgd
       config:
         # 配置中心地址
+     #   server-addr: 192.168.0.14:8848
         server-addr: 127.0.0.1:18848
-       # server-addr: 192.168.0.14:8848
-      #  server-addr: 192.168.0.14:8848
-     #   server-addr: 127.0.0.1:8848
         namespace: jjzhgd
         # 配置文件格式
         file-extension: yml

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/SjProjectQualityController.java

@@ -0,0 +1,74 @@
+package com.securitycontrol.background.controller;
+
+import com.securitycontrol.background.service.SjProjectQualityService;
+import com.securitycontrol.common.core.web.controller.BaseController;
+import com.securitycontrol.common.core.web.domain.AjaxResult;
+import com.securitycontrol.common.core.web.page.TableDataInfo;
+import com.securitycontrol.common.log.annotation.Log;
+import com.securitycontrol.common.log.enums.OperationType;
+import com.securitycontrol.entity.background.dto.ParamDto;
+import com.securitycontrol.entity.background.vo.ProjectVo;
+import com.securitycontrol.entity.background.vo.SjProjectQualityVo;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 工程质量分析后台管理系统
+ */
+@RestController
+@RequestMapping("/sj/proQuality/")
+@Slf4j
+public class SjProjectQualityController  extends BaseController {
+
+    @Autowired
+    private  SjProjectQualityService service;
+
+
+    @ApiOperation(value = "查询工程质量分析列表数据")
+    @GetMapping("list")
+    @Log(title = "数据分析", menu = "数据分析->工程质量分析", grade = OperationType.QUERY_BUSINESS, details = "查询工程质量分析数据", type = "业务日志")
+    public TableDataInfo getList(SjProjectQualityVo dto) {
+        startPage();
+        List<SjProjectQualityVo> list = new ArrayList<>();
+        list = service.getList(dto);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "新增工程质量分析数据")
+    @PostMapping("addData")
+    @Log(title = "数据分析", menu = "数据分析->工程质量分析", grade = OperationType.ADD_BUSINESS, details = "新增数据", type = "业务日志")
+    public AjaxResult addData(@RequestBody SjProjectQualityVo vo) {
+        return service.addData(vo);
+    }
+
+
+
+    @ApiOperation(value = "数据详情")
+    @PostMapping(value="getDetails")
+    public AjaxResult getDetails(SjProjectQualityVo dto){
+        return service.getDetails(dto);
+    }
+
+
+    @ApiOperation(value = "新增工程质量分析数据")
+    @PostMapping("updateData")
+    @Log(title = "数据分析", menu = "数据分析->工程质量分析", grade = OperationType.ADD_BUSINESS, details = "修改数据", type = "业务日志")
+    public AjaxResult updateData(@RequestBody SjProjectQualityVo vo) {
+        return service.updateData(vo);
+    }
+
+
+    @ApiOperation(value = "数据详情")
+    @PostMapping(value="delete")
+    @Log(title = "数据分析", menu = "数据分析->工程质量分析", grade = OperationType.ADD_BUSINESS, details = "删除数据", type = "业务日志")
+    public AjaxResult delete(SjProjectQualityVo dto){
+        return service.delete(dto);
+    }
+
+
+}

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/SjProjectQualityMapper.java

@@ -0,0 +1,48 @@
+package com.securitycontrol.background.mapper;
+
+import com.securitycontrol.common.core.web.domain.AjaxResult;
+import com.securitycontrol.entity.background.vo.SjProjectQualityVo;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 审计质量管理模块
+ */
+@Repository(value = "SjProjectQualityMapper")
+public interface SjProjectQualityMapper {
+    /**
+     * 查询质量数据集合
+     * @param dto
+     * @return
+     */
+    List<SjProjectQualityVo> getList(SjProjectQualityVo dto);
+
+    /**
+     * 新增数据
+     * @param vo
+     * @return
+     */
+    Integer addData(SjProjectQualityVo vo);
+
+    /**
+     * 修改数据
+     * @param vo
+     * @return
+     */
+    Integer updateData(SjProjectQualityVo vo);
+
+    /**
+     * 查询数据详情
+     * @param vo
+     * @return
+     */
+    SjProjectQualityVo getDetails(SjProjectQualityVo vo);
+
+    /**
+     * 删除数据
+     * @param vo
+     * @return
+     */
+    Integer delete(SjProjectQualityVo vo);
+}

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/SjProjectQualityService.java

@@ -0,0 +1,45 @@
+package com.securitycontrol.background.service;
+
+import com.securitycontrol.common.core.web.domain.AjaxResult;
+import com.securitycontrol.entity.background.dto.ParamDto;
+import com.securitycontrol.entity.background.vo.ProjectVo;
+import com.securitycontrol.entity.background.vo.SjProjectQualityVo;
+
+import java.util.List;
+
+public interface SjProjectQualityService {
+    /**
+     *
+     * @param dto
+     * @return
+     */
+    List<SjProjectQualityVo> getList(SjProjectQualityVo dto);
+
+    /**
+     * 新增数据
+     * @param vo
+     * @return
+     */
+    AjaxResult addData(SjProjectQualityVo vo);
+
+    /**
+     * 修改数据
+     * @param vo
+     * @return
+     */
+    AjaxResult updateData(SjProjectQualityVo vo);
+
+    /**
+     * 查询数据详情
+     * @param dto
+     * @return
+     */
+    AjaxResult getDetails(SjProjectQualityVo dto);
+
+    /**
+     * 删除多余的数据
+     * @param dto
+     * @return
+     */
+    AjaxResult delete(SjProjectQualityVo dto);
+}

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/SjProjectQualityServiceImpl.java

@@ -0,0 +1,92 @@
+package com.securitycontrol.background.service.impl;
+
+import com.securitycontrol.background.mapper.SjProjectQualityMapper;
+import com.securitycontrol.background.service.SjProjectQualityService;
+import com.securitycontrol.common.core.web.domain.AjaxResult;
+import com.securitycontrol.entity.background.dto.ParamDto;
+import com.securitycontrol.entity.background.vo.ProjectVo;
+import com.securitycontrol.entity.background.vo.SjProjectQualityVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Slf4j
+@Service
+public class SjProjectQualityServiceImpl implements SjProjectQualityService {
+
+    @Autowired
+    private SjProjectQualityMapper mapper;
+    /**
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public List<SjProjectQualityVo> getList(SjProjectQualityVo dto) {
+        try{
+            return mapper.getList(dto);
+        }catch (Exception e){
+            log.error(e.getMessage());
+        }
+        return Collections.emptyList();
+    }
+
+    /**
+     * 新增工程质量数据
+     * @param vo
+     * @return
+     */
+    @Override
+    public AjaxResult addData(SjProjectQualityVo vo) {
+        try{
+            Integer num= mapper.addData(vo);
+            if(num!=null && num>0){
+                return AjaxResult.success("添加成功");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage());
+        }
+        return AjaxResult.error("新增失败,数据长度过长");
+    }
+
+    @Override
+    public AjaxResult updateData(SjProjectQualityVo vo) {
+        try{
+             Integer num= mapper.updateData(vo);
+            if(num!=null && num>0){
+                return AjaxResult.success("添加成功");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage());
+        }
+        return AjaxResult.error("修改失败,数据长度过长");
+    }
+
+    @Override
+    public AjaxResult getDetails(SjProjectQualityVo vo) {
+        try{
+            SjProjectQualityVo data= mapper.getDetails(vo);
+            return AjaxResult.success(data);
+        }catch (Exception e){
+            log.error(e.getMessage());
+        }
+        return AjaxResult.success(vo);
+    }
+
+    @Override
+    public AjaxResult delete(SjProjectQualityVo vo) {
+        try{
+           Integer num= mapper.delete(vo);
+           if(num>0){
+               return AjaxResult.success("删除成功");
+           }
+
+        }catch (Exception e){
+            log.error(e.getMessage());
+        }
+        return AjaxResult.error("删除失败,数据id不正确");
+    }
+}

securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 13033
+  port: 33033
 management:
   server:
     port: -1
@@ -18,15 +18,15 @@ spring:
   cloud:
     nacos:
       username: nacos
-    #  password: nacos
+      password: nacos
-      password: Jjsp@nacos2023
+    #  password: Jjsp@nacos2023
       discovery:
-        server-addr: 127.0.0.1:18848
+        #server-addr: 127.0.0.1:18848
-        #server-addr: 192.168.0.14:8848
+        server-addr: 192.168.0.14:8848
         namespace: jjzhgd
       config:
-        server-addr: 127.0.0.1:18848
+     #   server-addr: 127.0.0.1:18848
-     #   server-addr: 192.168.0.14:8848
+        server-addr: 192.168.0.14:8848
         namespace: jjzhgd
         # 配置文件格式
         file-extension: yml
@@ -39,7 +39,6 @@ jasypt:
     password: Encrypt
 
 file:
-  upload_path: /data/zhgd/file
   temp_file_path: /data/zhgd/file
 pagehelper:
   helper-dialect: mysql

securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjProjectQualityMapper.xml

@@ -0,0 +1,72 @@
+<?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.securitycontrol.background.mapper.SjProjectQualityMapper">
+    <!--新增数据-->
+    <insert id="addData">
+        insert into sj_project_quality(
+                pro_type,pro_structure,total_item,
+        accept_item,accept_table,accept_qualified_table,
+    accept_rate,accept_tb_rate,main_accept_num,
+    main_one_accept_num,main_accept_rate,comm_accept,
+    comm_one_accep,comm_accept_rate
+        )values (#{proType},#{proStructure},#{totalItem},#{acceptItem},#{acceptTable},#{acceptQualifiedTable}
+        #{acceptItem},#{acceptTbRate},#{mainAcceptNum},#{mainOneAcceptNum},#{mainAcceptRate},#{commAccept},#{commOneAccept},#{commAcceptRate}
+    )
+    </insert>
+    <!--修改质量数据-->
+    <update id="updateData">
+        update sj_project_quality set   pro_type=#{proType},pro_structure=#{proStructure},total_item=#{totalItem},
+                                        accept_item=#{acceptItem},accept_table=#{acceptTable},accept_qualified_table=#{acceptQualifiedTable},
+                                        accept_rate=#{acceptRate},accept_tb_rate=#{acceptTbRate},main_accept_num=#{mainAcceptRate},
+                                        main_one_accept_num=#{mainOneAcceptNum},main_accept_rate=#{mainAcceptRate},comm_accept=#{commAccept},
+                                        comm_one_accep=#{commOneAccept},comm_accept_rate=#{commAcceptRate}
+        where id=#{id}
+    </update>
+    <delete id="delete">
+         delete from sj_project_quality where id=#{id}
+    </delete>
+    <!--  -->
+    <select id="getList" resultType="com.securitycontrol.entity.background.vo.SjProjectQualityVo">
+        select  id, pro_type proType,
+            pro_structure proStructure,
+            total_item totalItem,
+            accept_item acceptItem,
+            accept_table acceptTable,
+            accept_qualified_table acceptQualifiedTable,
+            accept_rate acceptRate,
+            accept_tb_rate acceptTbRate,
+            main_accept_num mainAcceptNum,
+            main_one_accept_num mainOneAcceptNum,
+            main_accept_rate mainAcceptRate,
+            comm_accept commAccept ,
+            comm_one_accep commOneAccept,
+            comm_accept_rate commAcceptRate
+        from sj_project_quality
+        <where>
+            <if test="proType!=null and proType!=''">
+                pro_type like concat('%',#{proType},'%')
+            </if>
+            <if test="proStructure!=null and proStructure!=''">
+                pro_structure like concat('%',#{proStructure},'%')
+            </if>
+        </where>
+    </select>
+    <select id="getDetails" resultType="com.securitycontrol.entity.background.vo.SjProjectQualityVo">
+        select  id, pro_type proType,
+                pro_structure proStructure,
+                total_item totalItem,
+                accept_item acceptItem,
+                accept_table acceptTable,
+                accept_qualified_table acceptQualifiedTable,
+                accept_rate acceptRate,
+                accept_tb_rate acceptTbRate,
+                main_accept_num mainAcceptNum,
+                main_one_accept_num mainOneAcceptNum,
+                main_accept_rate mainAcceptRate,
+                comm_accept commAccept ,
+                comm_one_accep commOneAccept,
+                comm_accept_rate commAcceptRate
+        from sj_project_quality
+        where id=#{id}
+    </select>
+</mapper>

securitycontrol-model/securitycontrol-files/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 13035
+  port: 33035
 
 # Spring
 spring:
@@ -22,13 +22,16 @@ spring:
   cloud:
     nacos:
       username: nacos
-      password: Jjsp@nacos2023
+      password: nacos
+    #  password: Jjsp@nacos2023
       discovery:
-        server-addr: 127.0.0.1:18848
+        server-addr: 192.168.0.14:8848
+      #  server-addr: 127.0.0.1:18848
         namespace: jjzhgd
      #   server-addr: 27.50.49.56:21625
       config:
-        server-addr: 127.0.0.1:18848
+        server-addr: 192.168.0.14:8848
+   #     server-addr: 127.0.0.1:18848
         namespace: jjzhgd
      #   server-addr: 27.50.49.56:21625
         # 配置文件格式
@@ -53,13 +56,6 @@ file:
 #    upload_path: F:/files/zhgd/
 #  linux:
 #    upload_path: /data/zhgd/file
-  data:
-    mongodb:
-      host: 47.115.207.135
-      port: 27017
-      database: admin
-      username: admin
-      password: Bonus@admin123!
 #加密组件
 
 #management.security.enabled=true security.user.name=admin security.user.password=admin 2

securitycontrol-model/securitycontrol-screen/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 13034
+  port: 33034
 management:
   server:
     port: -1
@@ -18,12 +18,15 @@ spring:
   cloud:
     nacos:
       username: nacos
-      password: Jjsp@nacos2023
+      password: nacos
+      #  password: Jjsp@nacos2023
       discovery:
-        server-addr: 127.0.0.1:18848
+        server-addr: 192.168.0.14:8848
+      #  server-addr: 127.0.0.1:18848
         namespace: jjzhgd
       config:
-        server-addr: 127.0.0.1:18848
+        server-addr: 192.168.0.14:8848
+      #  server-addr: 127.0.0.1:18848
         namespace: jjzhgd
           # 配置文件格式
         file-extension: yml

securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 13032
+  port: 33032
 management:
   server:
     port: -1
@@ -18,15 +18,15 @@ spring:
   cloud:
     nacos:
       username: nacos
-    #  password: nacos
+      password: nacos
-      password: Jjsp@nacos2023
+    #  password: Jjsp@nacos2023
       discovery:
-        server-addr: 127.0.0.1:18848
+      #  server-addr: 127.0.0.1:18848
-       # server-addr: 192.168.0.14:8848
+        server-addr: 192.168.0.14:8848
         namespace: jjzhgd
       config:
-        server-addr: 127.0.0.1:18848
+       # server-addr: 127.0.0.1:18848
-     #   server-addr: 192.168.0.14:8848
+        server-addr: 192.168.0.14:8848
      #   server-addr: 127.0.0.1:8848
         namespace: jjzhgd
         # 配置文件格式