APP项目 依赖管理

pom.xml

@@ -233,6 +233,13 @@
                 <version>${zd.version}</version>
             </dependency>
 
+            <!-- 项目整合之后这个包要处理掉 -->
+            <dependency>
+                <groupId>com.zd</groupId>
+                <artifactId>zd-api-system</artifactId>
+                <version>${zd.version}</version>
+            </dependency>
+
             <!-- 多数据源 -->
             <dependency>
                 <groupId>com.zd</groupId>

zd-api/pom.xml

@@ -12,7 +12,7 @@
     <description>api接口</description>
 
     <modules>
-        <module>zd-api-system</module>
+        <module>zd-api-system</module><!--整合完成之后要处理掉-->
         <module>zd-system-api</module>
         <module>zd-base-api</module>
         <module>zd-laboratory-api</module>

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/entity/AppSubQuery.java

@@ -0,0 +1,49 @@
+package com.zd.laboratory.api.entity;
+
+/**
+ * @Author: zhoupan
+ * @Date: 2021/11/18/17:39
+ * @Description:
+ */
+public class AppSubQuery {
+
+    /**
+     * 所属院系
+     */
+    Long deptId;
+
+    /**
+     * 学科分了
+     */
+    String subDept;
+
+    /**
+     * 分级
+     */
+    Integer level;
+
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getSubDept() {
+        return subDept;
+    }
+
+    public void setSubDept(String subDept) {
+        this.subDept = subDept;
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+}

zd-modules/zd-modules-app/pom.xml

@@ -42,21 +42,42 @@
         </dependency>
 
         <!-- Swagger UI -->
-        <dependency>
+        <!--<dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
             <version>${swagger.fox.version}</version>
-        </dependency>
+        </dependency>-->
 
         <!-- zd Common Swagger -->
         <dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-swagger</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-security</artifactId>
+        </dependency>-->
+
+        <dependency>
+            <groupId>com.zd.core</groupId>
+            <artifactId>common-core</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.zd.exam</groupId>
+            <artifactId>zd-exam-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.laboratory</groupId>
+            <artifactId>zd-laboratory-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.system</groupId>
+            <artifactId>zd-system-api</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -73,15 +94,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- 打包时跳过test插件，不运行test测试用例 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>

zd-modules/zd-modules-app/src/main/java/com/zd/app/ZdAppApplication.java

@@ -1,12 +1,10 @@
 package com.zd.app;
 
-import com.zd.common.security.annotation.EnableCustomConfig;
-import com.zd.common.security.annotation.EnableRyFeignClients;
-//import com.zd.common.swagger.annotation.EnableCustomSwagger2;
+import com.zd.common.core.annotation.EnableCustomConfig;
+import com.zd.common.core.annotation.EnableRyFeignClients;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
 
 /**
  * 小程序web层
@@ -14,7 +12,6 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
  * @author zhoupan
  */
 @EnableCustomConfig
-//@EnableCustomSwagger2
 @EnableRyFeignClients
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class ZdAppApplication {

zd-modules/zd-modules-app/src/main/java/com/zd/app/controller/ExamApi.java

@@ -1,21 +1,16 @@
 package com.zd.app.controller;
 
-import com.zd.common.core.domain.R;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.exam.RemoteExamService;
-import com.zd.system.api.exam.domain.ElPaperQuDTO;
+import com.zd.exam.api.feign.RemoteExamService;
+import com.zd.model.domain.R;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

zd-modules/zd-modules-app/src/main/java/com/zd/app/controller/LabApi.java

@@ -1,29 +1,20 @@
 package com.zd.app.controller;
 
-import com.zd.common.core.domain.R;
-import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.domain.LabStudentsInfo;
-import com.zd.system.api.domain.SysFile;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.domain.LabSubjectControllerVO;
-import com.zd.system.api.students.RemoteStudentsService;
+import com.zd.common.core.security.TokenService;
+import com.zd.laboratory.api.entity.LabSubjectControllerVO;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.laboratory.api.feign.RemoteStudentsService;
+import com.zd.model.domain.R;
+import com.zd.model.page.TableDataInfo;
+import com.zd.system.api.entity.LabStudentsInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -63,7 +54,7 @@ public class LabApi {
 
     @ApiOperation(value = "获取随手拍记录列表信息（管理端）")
     @GetMapping("/photonote/getAppList")
-    public TableDataInfo getAppList(@RequestParam Integer pageNum, @RequestParam Integer pageSize,@RequestParam Integer handleStatus) {
+    public TableDataInfo getAppList(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @RequestParam Integer handleStatus) {
         Map map = new HashMap(3);
         map.put("handleUser", tokenService.getLoginUser().getUserid());
         map.put("appPageNum", pageNum);

zd-modules/zd-modules-app/src/main/java/com/zd/app/controller/LabManageController.java

@@ -1,9 +1,9 @@
 package com.zd.app.controller;
 
-import com.zd.common.core.domain.R;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.domain.LabGradeManageRecord;
-import com.zd.system.api.laboratory.domain.vo.LabGradeManageWorkVO;
+import com.zd.laboratory.api.entity.LabGradeManageRecord;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.laboratory.api.vo.LabGradeManageWorkVO;
+import com.zd.model.domain.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-modules-app/src/main/java/com/zd/app/controller/LabPhotoInspection.java

@@ -1,7 +1,7 @@
 package com.zd.app.controller;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-modules-app/src/main/java/com/zd/app/controller/LaboratoryApi.java

@@ -1,17 +1,19 @@
 package com.zd.app.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.zd.common.core.domain.R;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.domain.AppSubQuery;
-import com.zd.system.api.domain.SubQueryConfig;
-import com.zd.system.api.domain.SysDept;
-import com.zd.system.api.laboratory.RemoteSubQueryService;
+import com.zd.common.core.security.TokenService;
+import com.zd.laboratory.api.entity.AppSubQuery;
+import com.zd.laboratory.api.feign.RemoteSubQueryService;
+import com.zd.model.domain.R;
+import com.zd.model.entity.SubQueryConfig;
+import com.zd.model.entity.SysDept;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
 
@@ -41,7 +43,7 @@ public class LaboratoryApi {
     @ApiOperation("实验室详情")
     public R querySub(@PathVariable("id") Long id)
     {
-        return remoteSubQueryService.getSafeWarnCount(id,SubQueryConfig.subQueryConfigWran);
+        return remoteSubQueryService.getSafeWarnCount(id, SubQueryConfig.subQueryConfigWran);
     }
 
     /**

zd-modules/zd-modules-app/src/main/java/com/zd/app/controller/MessageContentApi.java

@@ -1,10 +1,9 @@
 package com.zd.app.controller;
 
-import com.zd.common.core.domain.R;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.system.api.laboratory.RemoteMessageContentService;
-import com.zd.system.api.laboratory.domain.LabMessageUser;
-import com.zd.system.api.laboratory.domain.vo.LabMessageUserListVO;
+import com.zd.laboratory.api.entity.LabMessageUser;
+import com.zd.laboratory.api.feign.RemoteMessageContentService;
+import com.zd.model.domain.R;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-modules-app/src/main/java/com/zd/app/controller/SysUserApi.java

@@ -1,17 +1,17 @@
 package com.zd.app.controller;
 
-import com.zd.common.core.constant.SecurityConstants;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.qc.Base64DecodeMultipartFile;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.file.ImageUtils;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.RemoteDeptService;
-import com.zd.system.api.RemoteUserService;
-import com.zd.system.api.model.LoginUser;
-import com.zd.system.api.model.SimpleUserVO;
+import com.zd.model.constant.SecurityConstants;
+import com.zd.model.domain.R;
+import com.zd.model.entity.LoginUser;
+import com.zd.model.qc.Base64DecodeMultipartFile;
+import com.zd.system.api.feign.RemoteDeptService;
+import com.zd.system.api.feign.RemoteUserService;
+import com.zd.system.api.vo.SimpleUserVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.net.util.Base64;
+import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

zd-modules/zd-modules-app/src/main/resources/banner.txt

@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
-                            _                           _                    
-                           (_)                         | |                   
- _ __  _   _   ___   _   _  _  ______  ___  _   _  ___ | |_   ___  _ __ ___  
-| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ 
-| |   | |_| || (_) || |_| || |        \__ \| |_| |\__ \| |_ |  __/| | | | | |
-|_|    \__,_| \___/  \__, ||_|        |___/ \__, ||___/ \__| \___||_| |_| |_|
-                      __/ |                  __/ |                           
-                     |___/                  |___/