安全模块服务添加

pom.xml

@@ -309,8 +309,8 @@
                 <version>${zd.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.zd.check</groupId>
-                <artifactId>zd-check-api</artifactId>
+                <groupId>com.zd.security</groupId>
+                <artifactId>zd-security-api</artifactId>
                 <version>${zd.version}</version>
             </dependency>
         </dependencies>

zd-api/pom.xml

@@ -20,6 +20,7 @@
         <module>zd-algorithm-api</module>
         <module>zd-airbottle-api</module>
         <module>zd-auth-api</module>
+        <module>zd-security-api</module>
     </modules>
 
     <dependencies>

zd-api/zd-check-api/pom.xml

@@ -9,10 +9,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.zd.check</groupId>
-    <artifactId>zd-check-api</artifactId>
+    <groupId>com.zd.security</groupId>
+    <artifactId>zd-security-api</artifactId>
     <packaging>jar</packaging>
-    <description>安全检查api</description>
-
+    <description>实验室安全模块api</description>
 
 </project>

zd-api/zd-check-api/src/main/java/com/zd/check/api/bo/CheckTestBo.java

@@ -1,4 +1,4 @@
-package com.zd.check.api.bo;
+package com.zd.security.api.bo;
 
 import com.zd.model.page.PageQuery;
 import io.swagger.annotations.ApiModelProperty;

zd-api/zd-check-api/src/main/java/com/zd/check/api/feign/RemoteCheckTestService.java

@@ -1,7 +1,7 @@
-package com.zd.check.api.feign;
+package com.zd.security.api.feign;
 
-import com.zd.check.api.feign.factory.RemoteCheckTestFallback;
 import com.zd.model.constant.ApplicationConstants;
+import com.zd.security.api.feign.factory.RemoteCheckTestFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 
 /**
@@ -11,7 +11,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  * @version 1.0
  * @date 04/14/2023
  */
-@FeignClient(contextId = "remoteCheckTestService", value = ApplicationConstants.CHECK_SERVICE, fallbackFactory = RemoteCheckTestFallback.class)
+@FeignClient(contextId = "remoteCheckTestService", value = ApplicationConstants.SECURITY_SERVICE, fallbackFactory = RemoteCheckTestFallback.class)
 public interface RemoteCheckTestService {
 
 }

zd-api/zd-check-api/src/main/java/com/zd/check/api/feign/factory/RemoteCheckTestFallback.java

@@ -1,4 +1,4 @@
-package com.zd.check.api.feign.factory;
+package com.zd.security.api.feign.factory;
 
 import org.springframework.stereotype.Component;
 

zd-api/zd-check-api/src/main/java/com/zd/check/api/vo/CheckTestVo.java

@@ -1,10 +1,11 @@
-package com.zd.check.api.vo;
+package com.zd.security.api.vo;
 
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 

zd-model/src/main/java/com/zd/model/constant/ApplicationConstants.java

@@ -58,8 +58,8 @@ public interface ApplicationConstants {
 
 
     /**
-     * 安全检查服务
+     * 安全服务
      */
-    String CHECK_SERVICE = "zd-check";
+    String SECURITY_SERVICE = "zd-security";
 
 }

zd-model/src/main/resources/application.yml

@@ -11,6 +11,6 @@ service:
     exam: 9014
     algorithm: 9015
     bottle: 9016
-    check: 9017
+    security: 9017
     app: 9021
 

zd-modules/pom.xml

@@ -20,7 +20,7 @@
         <module>zd-bottle-parent</module>
         <module>zd-algorithm</module>
         <module>zd-base</module>
-        <module>zd-check</module>
+        <module>zd-security</module>
     </modules>
 
     <dependencies>

zd-modules/zd-check/src/main/java/com/zd/check/config/AutoFillHandler.java

@@ -1,45 +0,0 @@
-package com.zd.check.config;
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import org.apache.ibatis.reflection.MetaObject;
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * MyBatis自动填充
- */
-public class AutoFillHandler implements MetaObjectHandler {
-
-    /**
-     * 插入时填充字段
-     *
-     * @param metaObject 元数据
-     */
-    @Override
-    public void insertFill(MetaObject metaObject) {
-        List<String> strings = Arrays.asList(metaObject.getGetterNames());
-        if (strings.contains("createBy")) {
-            this.setFieldValByName("createBy", 0L, metaObject);
-        }
-        if (strings.contains("createTime")) {
-            this.setFieldValByName("createTime", LocalDateTime.now(), metaObject);
-        }
-    }
-
-    /**
-     * 更新时填充字段
-     *
-     * @param metaObject 元数据
-     */
-    @Override
-    public void updateFill(MetaObject metaObject) {
-        List<String> strings = Arrays.asList(metaObject.getGetterNames());
-        if (strings.contains("updateBy")) {
-            this.setFieldValByName("updateBy", 0L, metaObject);
-        }
-        if (strings.contains("updateTime")) {
-            this.setFieldValByName("updateTime", LocalDateTime.now(), metaObject);
-        }
-    }
-}

zd-modules/zd-check/src/main/java/com/zd/check/config/MybatisPlusConfig.java

@@ -1,30 +0,0 @@
-package com.zd.check.config;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * <p>MybatisPlus配置</p>
- *
- * @author: linft
- * @date: 2023/4/14
- * @since:
- */
-@Configuration
-public class MybatisPlusConfig {
-
-    @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
-        return interceptor;
-    }
-
-    @Bean
-    public AutoFillHandler autoFillHandler() {
-        return new AutoFillHandler();
-    }
-}

zd-modules/zd-check/src/main/resources/bootstrap.yml

@@ -1,8 +0,0 @@
-server:
-  port: ${service.port.check}
-
-# mybatis配置
-mybatis-plus:
-  configuration:
-    cache-enabled: false
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityApplyController.java

@@ -5,12 +5,10 @@ import java.util.*;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
-import NetSDKDemo.HCNetSDK;
 import com.github.pagehelper.PageHelper;
 import com.zd.common.core.utils.*;
 import com.zd.laboratory.domain.LabWhitelist;
 import com.zd.laboratory.service.*;
-import com.zd.model.constant.HttpStatus;
 import com.zd.model.constant.UserConstants;
 import com.zd.model.domain.R;
 import com.zd.model.domain.per.PerFun;

zd-modules/zd-check/pom.xml

@@ -8,10 +8,11 @@
         <version>3.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.zd.check</groupId>
-    <artifactId>zd-check</artifactId>
+
+    <groupId>com.zd.security</groupId>
+    <artifactId>zd-security</artifactId>
     <packaging>jar</packaging>
-    <description>安全检查服务</description>
+    <description>实验室安全服务</description>
 
     <dependencies>
         <!-- SpringCloud Alibaba Nacos -->
@@ -60,8 +61,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.zd.check</groupId>
-            <artifactId>zd-check-api</artifactId>
+            <groupId>com.zd.security</groupId>
+            <artifactId>zd-security-api</artifactId>
         </dependency>
     </dependencies>
 
@@ -85,4 +86,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

zd-modules/zd-check/src/main/java/com/zd/check/CodeGenerator.java

@@ -1,4 +1,4 @@
-package com.zd.check;
+package com.zd.security;
 
 
 import com.zd.common.core.mybatisplus.MybatisPlusGenerator;

zd-modules/zd-check/src/main/java/com/zd/check/ZdCheckApplication.java

@@ -1,4 +1,4 @@
-package com.zd.check;
+package com.zd.security;
 
 
 import com.zd.common.core.annotation.EnableCustomConfig;
@@ -18,6 +18,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 public class ZdCheckApplication {
 
     public static void main(String[] args) {
-        ZdStartApplication.run(ApplicationConstants.CHECK_SERVICE, ZdCheckApplication.class, args);
+        ZdStartApplication.run(ApplicationConstants.SECURITY_SERVICE, ZdCheckApplication.class, args);
     }
 }

zd-modules/zd-check/src/main/java/com/zd/check/controller/TestController.java

@@ -1,14 +1,15 @@
-package com.zd.check.controller;
+package com.zd.security.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zd.check.api.bo.CheckTestBo;
-import com.zd.check.entity.CheckTest;
-import com.zd.check.service.CheckTestService;
-import com.zd.check.util.PageUtil;
+
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.web.controller.AbstractController;
 import com.zd.model.domain.ResultData;
+import com.zd.security.api.bo.CheckTestBo;
+import com.zd.security.entity.CheckTest;
+import com.zd.security.service.CheckTestService;
+import com.zd.security.util.PageUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -86,8 +87,9 @@ public class TestController extends AbstractController {
         if (StringUtils.isNotEmpty(testBo.getTestName())) {
             wrapper.lambda().like(CheckTest::getTestName, testBo.getTestName());
         }
-        //倒叙
-        wrapper.lambda().orderByDesc(CheckTest::getTestId);
+
+        //过滤物理删除数据及倒叙
+        wrapper.lambda().eq(CheckTest::getIsDeleted, Boolean.FALSE).orderByDesc(CheckTest::getTestId);
         IPage<CheckTest> result = checkTestService.page(PageUtil.getQuery(testBo.getPage(), testBo.getPageSize()), wrapper);
         return ResultData.success(result);
     }
@@ -97,16 +99,18 @@ public class TestController extends AbstractController {
      * @param testBo
      * @return
      */
-    @GetMapping(value = "/delete")
-    public ResultData delete(CheckTestBo testBo) {
+    @PostMapping(value = "/delete")
+    public ResultData delete(@RequestBody CheckTestBo testBo) {
         paramCheck.notNull(testBo)
                 .notNull(testBo.getTestId());
         //物理删除
         //boolean bool = checkTestService.removeById(testBo.getTestId());
+
         //逻辑删除
-        QueryWrapper<CheckTest> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(CheckTest::getTestId, testBo.getTestId()).eq(CheckTest::getIsDeleted, Boolean.TRUE);
-        boolean bool = checkTestService.update(wrapper);
+        CheckTest checkTest = new CheckTest();
+        checkTest.setTestId(testBo.getTestId());
+        checkTest.setIsDeleted(Boolean.TRUE);
+        boolean bool = checkTestService.updateById(checkTest);
         if(bool) {
             return ResultData.success("操作成功");
         }

zd-modules/zd-check/src/main/java/com/zd/check/entity/CheckTest.java

@@ -1,4 +1,4 @@
-package com.zd.check.entity;
+package com.zd.security.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +19,7 @@ import lombok.Setter;
  * </p>
  *
  * @author linft
- * @since 2023-04-14
+ * @since 2023-04-17
  */
 @Getter
 @Setter

zd-modules/zd-check/src/main/java/com/zd/check/mapper/CheckTestMapper.java

@@ -1,6 +1,6 @@
-package com.zd.check.mapper;
+package com.zd.security.mapper;
 
-import com.zd.check.entity.CheckTest;
+import com.zd.security.entity.CheckTest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author linft
- * @since 2023-04-14
+ * @since 2023-04-17
  */
 @Mapper
 public interface CheckTestMapper extends BaseMapper<CheckTest> {

zd-modules/zd-check/src/main/java/com/zd/check/service/CheckTestService.java

@@ -1,6 +1,6 @@
-package com.zd.check.service;
+package com.zd.security.service;
 
-import com.zd.check.entity.CheckTest;
+import com.zd.security.entity.CheckTest;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author linft
- * @since 2023-04-14
+ * @since 2023-04-17
  */
 public interface CheckTestService extends IService<CheckTest> {
 

zd-modules/zd-check/src/main/java/com/zd/check/service/impl/CheckTestServiceImpl.java

@@ -1,8 +1,8 @@
-package com.zd.check.service.impl;
+package com.zd.security.service.impl;
 
-import com.zd.check.entity.CheckTest;
-import com.zd.check.mapper.CheckTestMapper;
-import com.zd.check.service.CheckTestService;
+import com.zd.security.entity.CheckTest;
+import com.zd.security.mapper.CheckTestMapper;
+import com.zd.security.service.CheckTestService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author linft
- * @since 2023-04-14
+ * @since 2023-04-17
  */
 @Service
 public class CheckTestServiceImpl extends ServiceImpl<CheckTestMapper, CheckTest> implements CheckTestService {

zd-modules/zd-check/src/main/java/com/zd/check/util/PageUtil.java

@@ -1,4 +1,4 @@
-package com.zd.check.util;
+package com.zd.security.util;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;

zd-modules/zd-security/src/main/resources/bootstrap.yml

@@ -0,0 +1,8 @@
+server:
+  port: ${service.port.security}
+
+# mybatis配置
+mybatis-plus:
+  configuration:
+    cache-enabled: false
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

zd-modules/zd-check/src/main/resources/mapper/CheckTestMapper.xml

@@ -1,9 +1,9 @@
 <?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.zd.check.mapper.CheckTestMapper">
+<mapper namespace="com.zd.security.mapper.CheckTestMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.zd.check.entity.CheckTest">
+    <resultMap id="BaseResultMap" type="com.zd.security.entity.CheckTest">
         <id column="test_id" property="testId" />
         <result column="test_name" property="testName" />
         <result column="test_desc" property="testDesc" />