代码调整

common/common_utils/pom.xml

@@ -9,4 +9,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>common_utils</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file

common/common_utils/src/main/java/com/founder/commonutils/skMapEntity/CarKkInfo.java → common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarKkInfo.java

-package com.founder.commonutils.skMapEntity;
+package com.founder.commonutils.carEntity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/common_utils/src/main/java/com/founder/commonutils/skMapEntity/CarReceiving.java → common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarReceiving.java

-package com.founder.commonutils.skMapEntity;
+package com.founder.commonutils.carEntity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/common_utils/src/main/java/com/founder/commonutils/skMapEntity/CarRy.java → common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarRy.java

-package com.founder.commonutils.skMapEntity;
+package com.founder.commonutils.carEntity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/common_utils/src/main/java/com/founder/commonutils/skMapEntity/QgjdcModel.java → common/common_utils/src/main/java/com/founder/commonutils/carEntity/QgjdcModel.java

-package com.founder.commonutils.skMapEntity;
+package com.founder.commonutils.carEntity;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

common/common_utils/src/main/java/com/founder/commonutils/asjEntity/TbStRy.java → common/common_utils/src/main/java/com/founder/commonutils/peopleEntity/TbStRy.java

-package com.founder.commonutils.asjEntity;
+package com.founder.commonutils.peopleEntity;
 
 import java.util.Date;
 

common/common_utils/src/main/java/com/founder/commonutils/publicEntity/Receiving.java

@@ -173,7 +173,24 @@ public class Receiving implements Serializable {
     private String dwlxdm;
 
     private  String xzqhdm;
+    private  String begin;
+    private  String end;
 
+    public String getBegin() {
+        return begin;
+    }
+
+    public void setBegin(String begin) {
+        this.begin = begin;
+    }
+
+    public String getEnd() {
+        return end;
+    }
+
+    public void setEnd(String end) {
+        this.end = end;
+    }
 
     public String getXzqhdm() {
         return xzqhdm;

service/publicapi/src/main/java/com/founder/util/HttpUtil.java → common/common_utils/src/main/java/com/founder/commonutils/util/HttpUtil.java

-package com.founder.util;
+package com.founder.commonutils.util;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;

service/logs/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>service</artifactId>
+        <groupId>com.founder</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>logs</artifactId>
+    <build>
+        <finalName>logs</finalName>
+    </build>
+
+</project>
\ No newline at end of file

service/pom.xml

@@ -58,8 +58,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
-        <!-- 数据库驱动包 -->
-
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.0.0</version>
+        </dependency>
         <!--mysql-->
         <dependency>
             <groupId>mysql</groupId>

service/publicapi/pom.xml

@@ -11,5 +11,4 @@
 
     <artifactId>publicapi</artifactId>
 
-
 </project>
\ No newline at end of file

service/publicapi/src/main/java/com/founder/MapRedisApplication.java → service/publicapi/src/main/java/com/founder/pulicapi/MapRedisApplication.java

-package com.founder;
+package com.founder.pulicapi;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-//import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.context.annotation.ComponentScan;
+
 
-//为了让@Async注解能够生效，还需要在Spring Boot的主程序中配置@EnableAsync
-// 启用异步任务
-@EnableAsync
-//进行定时任务
-@EnableScheduling
-@MapperScan(value = "com.founder.mapper")
-//@EnableDiscoveryClient
 @SpringBootApplication
+@ComponentScan(basePackages = {"com.founder"})
 public class MapRedisApplication {
 
 	public static void main(String[] args) {

service/publicapi/src/main/java/com/founder/controller/RyController.java → service/publicapi/src/main/java/com/founder/pulicapi/controller/RyController.java

-package com.founder.controller;
+package com.founder.pulicapi.controller;
 
-import com.founder.commonutils.asjEntity.TbStRy;
+import com.founder.commonutils.peopleEntity.TbStRy;
 import com.founder.commonutils.publicEntity.R;
 import com.founder.commonutils.publicEntity.RyReceiving;
-import com.founder.commonutils.skMapEntity.CarReceiving;
-import com.founder.commonutils.skMapEntity.CarRy;
-import com.founder.commonutils.skMapEntity.QgjdcModel;
-import com.founder.service.SysDictitemService;
-import com.founder.util.HttpUtil;
-import io.swagger.annotations.Api;
+import com.founder.commonutils.carEntity.CarReceiving;
+import com.founder.commonutils.carEntity.CarRy;
+import com.founder.commonutils.carEntity.QgjdcModel;
+import com.founder.commonutils.util.HttpUtil;
+import com.founder.pulicapi.service.SysDictitemService;
 import io.swagger.annotations.ApiOperation;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;

service/publicapi/src/main/java/com/founder/mapper/oracle/SysDictitemMapper.java → service/publicapi/src/main/java/com/founder/pulicapi/mapper/SysDictitemMapper.java

-package com.founder.mapper.oracle;
+package com.founder.pulicapi.mapper;
 
 
 import java.util.Map;

service/publicapi/src/main/java/com/founder/service/SysDictitemService.java → service/publicapi/src/main/java/com/founder/pulicapi/service/SysDictitemService.java

-package com.founder.service;
+package com.founder.pulicapi.service;
 
 import java.util.Map;
 

service/publicapi/src/main/java/com/founder/service/serviceimpl/SysDictitemServiceImpl.java → service/publicapi/src/main/java/com/founder/pulicapi/service/serviceimpl/SysDictitemServiceImpl.java

-package com.founder.service.serviceimpl;
+package com.founder.pulicapi.service.serviceimpl;
 
 
-import com.founder.mapper.oracle.SysDictitemMapper;
-import com.founder.service.SysDictitemService;
+import com.founder.pulicapi.mapper.SysDictitemMapper;
+import com.founder.pulicapi.service.SysDictitemService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-
 import javax.annotation.Resource;
 import java.util.Map;
 

service/publicapi/src/main/resources/mybatis/mapper/oracle/SysDictitemMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.founder.mapper.oracle.SysDictitemMapper">
+<mapper namespace="com.founder.pulicapi.mapper.SysDictitemMapper">
 
     <!-- 根据code和groupid查询name值-->
     <select id="getNameByCode" parameterType="java.util.Map" resultType="java.lang.String">