修复荣信跨越部门级别查询bug

.gitignore

@@ -31,3 +31,4 @@ build/
 
 ### VS Code ###
 .vscode/
+logs

pom.xml

@@ -1,12 +1,12 @@
 <?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"
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>2.7.13</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<relativePath/>
+		<!--  lookup parent from repository  -->
 	</parent>
 	<groupId>com.hxgk</groupId>
 	<artifactId>zxxy</artifactId>
@@ -20,6 +20,22 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<!-- 上线配置 -->
+				<!-- <exclusion>
+                                    <groupId>org.springframework.boot</groupId>
+                                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                                </exclusion> -->
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!--  引入log4j2依赖  -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j2</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.baomidou</groupId>
@@ -31,14 +47,18 @@
 			<artifactId>druid-spring-boot-starter</artifactId>
 			<version>1.2.9</version>
 		</dependency>
+		<!-- 上线配置 -->
+		<!-- <dependency>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <scope>provided</scope>
+                </dependency> -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
 			<optional>true</optional>
 		</dependency>
-
 		<dependency>
-
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
@@ -53,20 +73,16 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 			<version>2.1.3</version>
 		</dependency>
-
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<version>8.0.24</version>
 		</dependency>
-
-
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
@@ -81,25 +97,90 @@
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
 			<version>1.4.6</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.alibaba.fastjson2/fastjson2 -->
+		<dependency>
+			<groupId>com.alibaba.fastjson2</groupId>
+			<artifactId>fastjson2</artifactId>
+			<version>2.0.46</version>
+		</dependency>
 
-	</dependencies>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>4.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>4.0.1</version>
+		</dependency>
 
+	</dependencies>
 	<build>
+		<finalName>zxxy</finalName>
 		<plugins>
+			<!-- <plugin>
+                            <groupId>org.springframework.boot</groupId>
+                            <artifactId>spring-boot-maven-plugin</artifactId>
+                            &lt;!&ndash;热部署配置&ndash;&gt;
+                            <configuration>
+                                <fork>true</fork>
+                            </configuration>
+
+                        </plugin> -->
 			<plugin>
-				<groupId>org.springframework.boot</groupId>
+				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.6.1</version>
+				<configuration>
+					<fork>true</fork>
+					<source>1.8</source>
+					<target>1.8</target>
+					<!-- 上线配置 -->
+					<encoding>UTF-8</encoding>
+					<!-- <encoding>GBK</encoding> -->
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>2.3.7.RELEASE</version>
+				<configuration>
+					<mainClass>com.hxgk.zxxy.ZxxyApplication</mainClass>
+				</configuration>
+				<executions>
+					<execution>
+						<id>repackage</id>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<!--  war 插件  -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
-					<fork>true</fork><!--必须添加这个配置-->
+					<warName>zxxy</warName>
 				</configuration>
 			</plugin>
 		</plugins>
-
+		<resources>
-
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.xml</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**/*.*</include>
+				</includes>
+			</resource>
+		</resources>
 	</build>
-
+	<!-- 上线配置 -->
-</project>
+	<packaging>war</packaging>
+</project>

src/main/java/com/hxgk/zxxy/ZxxyApplication.java

@@ -4,12 +4,21 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication(exclude= {DataSourceAutoConfiguration.class})
 @MapperScan("com.hxgk.zxxy.mapper")
 @EnableTransactionManagement
-public class ZxxyApplication {
+public class ZxxyApplication extends SpringBootServletInitializer {
+
+
+	@Override  //这个表示使用外部的tomcat容器
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+		// 注意这里要指向原先用main方法执行的启动类
+		return builder.sources(ZxxyApplication.class);
+	}
 
 	public static void main(String[] args) {
 		SpringApplication.run(ZxxyApplication.class, args);

src/main/java/com/hxgk/zxxy/controller/ArchivesTypeController.java

@@ -12,15 +12,18 @@ import java.util.List;
 import java.util.Map;
 
 @RestController
+
+
 @RequestMapping("archive")
 public class ArchivesTypeController {
     @Autowired
     private ArchivesTypeService archivesTypeService;
     @PostMapping("zxxy")
     public JsonData getZxxyArchivesType(@RequestBody ArchivesTypeRequest archivesTypeRequest){
-
         Long L = Long.parseLong(archivesTypeRequest.getAtParentId());
-        List<ArchivesType> archivesTypeList = archivesTypeService.getZxxyArchivesType(L);
+        String userkey = archivesTypeRequest.getUserkey();
+        String usertoken = archivesTypeRequest.getUsertoken();
+        List<ArchivesType> archivesTypeList = archivesTypeService.getZxxyArchivesType(L,userkey,usertoken);
         return JsonData.buildSuccess(archivesTypeList);
     }
 }

src/main/java/com/hxgk/zxxy/controller/GraphicformController.java

@@ -1,6 +1,7 @@
 package com.hxgk.zxxy.controller;
 
 import com.github.pagehelper.Page;
+import com.github.pagehelper.PageInfo;
 import com.hxgk.zxxy.model.entity.ArchivesType;
 import com.hxgk.zxxy.model.entity.Graphicform;
 import com.hxgk.zxxy.model.request.ArchivesTypeRequest;
@@ -21,9 +22,16 @@ import java.util.List;
 public class GraphicformController {
     @Autowired
     private GraphicformService graphicformService;
-    @PostMapping("zxxy")
+    @PostMapping("cardlist")
     public JsonData getZxxyArchivesType(@RequestBody GraphicformRequest graphicformRequest) throws Exception {
-        List<Graphicform> graphicformList = graphicformService.queryListByParam(graphicformRequest);
+        PageInfo<Graphicform> graphicformList = graphicformService.queryListByParam(graphicformRequest);
+        return JsonData.buildSuccess(graphicformList);
+    }
+
+
+    @PostMapping("carousel")
+    public JsonData getCarousel(@RequestBody GraphicformRequest graphicformRequest) throws Exception {
+        PageInfo<Graphicform> graphicformList = graphicformService.getCarousel(graphicformRequest);
         return JsonData.buildSuccess(graphicformList);
     }
 }

src/main/java/com/hxgk/zxxy/controller/LowCodeTransferController.java

@@ -0,0 +1,39 @@
+package com.hxgk.zxxy.controller;
+
+import com.hxgk.zxxy.model.entity.Car;
+import com.hxgk.zxxy.model.entity.OrgAndManTree;
+import com.hxgk.zxxy.model.entity.UserDetail;
+import com.hxgk.zxxy.service.HrService;
+import com.hxgk.zxxy.service.LowCodeTransferService;
+import com.hxgk.zxxy.service.UserService;
+import com.hxgk.zxxy.utils.JsonData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+@RestController
+@RequestMapping("lowCode")
+public class LowCodeTransferController {
+    @Autowired
+    private LowCodeTransferService lowCodeTransferService;
+    @Autowired
+    private HrService hrService;
+    @RequestMapping(value = "transfer/getCarList")
+    public JsonData getUserDetailFromRedis(@RequestParam(value = "transferMark", required = false) String transferMark){
+        ArrayList<Car> carList = lowCodeTransferService.getCarList();
+        return JsonData.buildSuccess(carList);
+
+    }
+
+    @RequestMapping(value = "transfer/getOrgAndManTree")
+    public JsonData getOrgAndManTree(@RequestParam(value = "transferMark", required = false) String transferMark){
+
+        OrgAndManTree orgAndManTree = hrService.getOrgAndManTree();
+        return JsonData.buildSuccess(orgAndManTree);
+    }
+}

src/main/java/com/hxgk/zxxy/controller/UserController.java

@@ -1,12 +1,11 @@
 package com.hxgk.zxxy.controller;
 
+import com.hxgk.zxxy.model.entity.ManCont;
 import com.hxgk.zxxy.model.entity.UserDetail;
 import com.hxgk.zxxy.service.UserService;
 import com.hxgk.zxxy.utils.JsonData;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
 
@@ -21,4 +20,13 @@ public class UserController {
         return JsonData.buildSuccess(userDetail);
 
     }
+
+    @GetMapping(value = "getByKey")
+    public JsonData getManContByKey(@RequestParam(value = "key", required = true) String key){
+        ManCont manCont = userService.getManContByKey(key);
+        return JsonData.buildSuccess(manCont);
+
+    }
+
+
 }

src/main/java/com/hxgk/zxxy/mapper/GraphicformMapper.java

@@ -5,7 +5,7 @@ import com.hxgk.zxxy.model.entity.Graphicform;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+@DS("readdocument")
 public interface GraphicformMapper {
     /*
         SELECT
@@ -36,6 +36,10 @@ public interface GraphicformMapper {
         g_recommend ASC
 
      */
-    @DS("readdocument")
+
     List<Graphicform> queryListByParam(@Param("g_parent") String gParent,@Param("g_parent_sun") String gParentSun, @Param("gBfIdList") List<Long> gBfIdList, @Param("gWsIdList") List<Long> gWsIdList, @Param("key") Long key);
+
+    List<Graphicform> queryCarousel(@Param("g_parent") String gParent,@Param("g_parent_sun") String gParentSun, @Param("gBfIdList") List<Long> gBfIdList, @Param("gWsIdList") List<Long> gWsIdList, @Param("key") Long key);
+
+    int queryCountByParam(@Param("g_parent") String gParent,@Param("g_parent_sun") String gParentSun, @Param("gBfIdList") List<Long> gBfIdList, @Param("gWsIdList") List<Long> gWsIdList, @Param("key") Long key);
 }

src/main/java/com/hxgk/zxxy/mapper/LowCodeTransferMapper.java

@@ -0,0 +1,8 @@
+package com.hxgk.zxxy.mapper;
+
+import com.hxgk.zxxy.model.entity.Car;
+import java.util.ArrayList;
+
+public interface LowCodeTransferMapper {
+    ArrayList<Car> getCarList();
+}

src/main/java/com/hxgk/zxxy/mapper/UserMapper.java

@@ -0,0 +1,14 @@
+package com.hxgk.zxxy.mapper;
+
+import com.hxgk.zxxy.model.entity.ManCont;
+import com.hxgk.zxxy.model.entity.OrgAndManTree;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface UserMapper {
+
+    ManCont getManContByKey(@Param("key") String key);
+
+    List<OrgAndManTree> getManContListByAdminOrg(@Param("adminOrg")String adminOrg);
+}

src/main/java/com/hxgk/zxxy/model/entity/ArchivesType.java

@@ -31,6 +31,16 @@ public class ArchivesType {
     private String atUid;
     //排序
     private Short atSort;
+    //本次查询有无数据
+    private Boolean hasCard;
+
+    public Boolean getHasCard() {
+        return hasCard;
+    }
+
+    public void setHasCard(Boolean hasCard) {
+        this.hasCard = hasCard;
+    }
 
     public String getAtId() {
         return atId;

src/main/java/com/hxgk/zxxy/model/entity/Car.java

@@ -0,0 +1,34 @@
+package com.hxgk.zxxy.model.entity;
+
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class Car {
+    private Integer id;
+    private String carName;
+    private Boolean isNewEnergy;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCarName() {
+        return carName;
+    }
+
+    public void setCarName(String carName) {
+        this.carName = carName;
+    }
+
+    public Boolean getNewEnergy() {
+        return isNewEnergy;
+    }
+
+    public void setNewEnergy(Boolean newEnergy) {
+        isNewEnergy = newEnergy;
+    }
+}

src/main/java/com/hxgk/zxxy/model/entity/Graphicform.java

@@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository;
 //图文信息表实体类
 public class Graphicform {
     //
-    private Long gId;
+    private String gId;
     //标题
     private String gTitle;
     //关键字
@@ -14,9 +14,9 @@ public class Graphicform {
     //描述
     private String gDescribe;
     //父级
-    private Long gParent;
+    private String gParent;
     //分类
-    private Long gParentSun;
+    private String gParentSun;
     //文档来源（1:原创；2：转载）
     private Byte gSource;
     //转载地址
@@ -24,7 +24,7 @@ public class Graphicform {
     //缩略图
     private String gThumbnail;
     //排序
-    private Long gSort;
+    private String gSort;
     //评论设置（1：允许评论；2：禁止评论）
     private Byte gComment;
     //访问权限（1：公开；2：分厂；3：工段；4：自定义）
@@ -32,17 +32,17 @@ public class Graphicform {
     //状态（1：草稿；2：发表；3：下架；4：删除）
     private Byte gState;
     //写入时间
-    private Long gAddTime;
+    private String gAddTime;
     //修改时间
-    private Long gEiteTime;
+    private String gEiteTime;
     //编辑人员
-    private Long gUserKey;
+    private String gUserKey;
     //分厂
-    private Long gBfId;
+    private String gBfId;
     //工段
-    private Long gWsId;
+    private String gWsId;
     //班组
-    private Long gTeam;
+    private String gTeam;
     //是否允许下载（1：允许；2：禁止）
     private Byte gDownloadState;
     //阅读量
@@ -74,11 +74,51 @@ public class Graphicform {
     //外部链接
     private String gOuterLink;
 
-    public Long getgId() {
+    @Override
+    public String toString() {
+        return "Graphicform{" +
+                "gId='" + gId + '\'' +
+                ", gTitle='" + gTitle + '\'' +
+                ", gKey='" + gKey + '\'' +
+                ", gDescribe='" + gDescribe + '\'' +
+                ", gParent='" + gParent + '\'' +
+                ", gParentSun='" + gParentSun + '\'' +
+                ", gSource=" + gSource +
+                ", gSourceUrl='" + gSourceUrl + '\'' +
+                ", gThumbnail='" + gThumbnail + '\'' +
+                ", gSort='" + gSort + '\'' +
+                ", gComment=" + gComment +
+                ", gVisitStrat=" + gVisitStrat +
+                ", gState=" + gState +
+                ", gAddTime='" + gAddTime + '\'' +
+                ", gEiteTime='" + gEiteTime + '\'' +
+                ", gUserKey='" + gUserKey + '\'' +
+                ", gBfId='" + gBfId + '\'' +
+                ", gWsId='" + gWsId + '\'' +
+                ", gTeam='" + gTeam + '\'' +
+                ", gDownloadState=" + gDownloadState +
+                ", gRead=" + gRead +
+                ", gComSum=" + gComSum +
+                ", gCollectionSum=" + gCollectionSum +
+                ", gLikes=" + gLikes +
+                ", gRecommend=" + gRecommend +
+                ", gContent='" + gContent + '\'' +
+                ", gStepOn=" + gStepOn +
+                ", gRange='" + gRange + '\'' +
+                ", gWriteBfid=" + gWriteBfid +
+                ", gTextName='" + gTextName + '\'' +
+                ", gTestUrl='" + gTestUrl + '\'' +
+                ", gPhysicsPath='" + gPhysicsPath + '\'' +
+                ", gWriteGroup=" + gWriteGroup +
+                ", gOuterLink='" + gOuterLink + '\'' +
+                '}';
+    }
+
+    public String getgId() {
         return gId;
     }
 
-    public void setgId(Long gId) {
+    public void setgId(String gId) {
         this.gId = gId;
     }
 
@@ -106,19 +146,19 @@ public class Graphicform {
         this.gDescribe = gDescribe;
     }
 
-    public Long getgParent() {
+    public String getgParent() {
         return gParent;
     }
 
-    public void setgParent(Long gParent) {
+    public void setgParent(String gParent) {
         this.gParent = gParent;
     }
 
-    public Long getgParentSun() {
+    public String getgParentSun() {
         return gParentSun;
     }
 
-    public void setgParentSun(Long gParentSun) {
+    public void setgParentSun(String gParentSun) {
         this.gParentSun = gParentSun;
     }
 
@@ -146,11 +186,11 @@ public class Graphicform {
         this.gThumbnail = gThumbnail;
     }
 
-    public Long getgSort() {
+    public String getgSort() {
         return gSort;
     }
 
-    public void setgSort(Long gSort) {
+    public void setgSort(String gSort) {
         this.gSort = gSort;
     }
 
@@ -178,51 +218,51 @@ public class Graphicform {
         this.gState = gState;
     }
 
-    public Long getgAddTime() {
+    public String getgAddTime() {
         return gAddTime;
     }
 
-    public void setgAddTime(Long gAddTime) {
+    public void setgAddTime(String gAddTime) {
         this.gAddTime = gAddTime;
     }
 
-    public Long getgEiteTime() {
+    public String getgEiteTime() {
         return gEiteTime;
     }
 
-    public void setgEiteTime(Long gEiteTime) {
+    public void setgEiteTime(String gEiteTime) {
         this.gEiteTime = gEiteTime;
     }
 
-    public Long getgUserKey() {
+    public String getgUserKey() {
         return gUserKey;
     }
 
-    public void setgUserKey(Long gUserKey) {
+    public void setgUserKey(String gUserKey) {
         this.gUserKey = gUserKey;
     }
 
-    public Long getgBfId() {
+    public String getgBfId() {
         return gBfId;
     }
 
-    public void setgBfId(Long gBfId) {
+    public void setgBfId(String gBfId) {
         this.gBfId = gBfId;
     }
 
-    public Long getgWsId() {
+    public String getgWsId() {
         return gWsId;
     }
 
-    public void setgWsId(Long gWsId) {
+    public void setgWsId(String gWsId) {
         this.gWsId = gWsId;
     }
 
-    public Long getgTeam() {
+    public String getgTeam() {
         return gTeam;
     }
 
-    public void setgTeam(Long gTeam) {
+    public void setgTeam(String gTeam) {
         this.gTeam = gTeam;
     }
 
@@ -345,44 +385,4 @@ public class Graphicform {
     public void setgOuterLink(String gOuterLink) {
         this.gOuterLink = gOuterLink;
     }
-
-    @Override
-    public String toString() {
-        return "Graphicform{" +
-                "gId=" + gId +
-                ", gTitle='" + gTitle + '\'' +
-                ", gKey='" + gKey + '\'' +
-                ", gDescribe='" + gDescribe + '\'' +
-                ", gParent=" + gParent +
-                ", gParentSun=" + gParentSun +
-                ", gSource=" + gSource +
-                ", gSourceUrl='" + gSourceUrl + '\'' +
-                ", gThumbnail='" + gThumbnail + '\'' +
-                ", gSort=" + gSort +
-                ", gComment=" + gComment +
-                ", gVisitStrat=" + gVisitStrat +
-                ", gState=" + gState +
-                ", gAddTime=" + gAddTime +
-                ", gEiteTime=" + gEiteTime +
-                ", gUserKey=" + gUserKey +
-                ", gBfId=" + gBfId +
-                ", gWsId=" + gWsId +
-                ", gTeam=" + gTeam +
-                ", gDownloadState=" + gDownloadState +
-                ", gRead=" + gRead +
-                ", gComSum=" + gComSum +
-                ", gCollectionSum=" + gCollectionSum +
-                ", gLikes=" + gLikes +
-                ", gRecommend=" + gRecommend +
-                ", gContent='" + gContent + '\'' +
-                ", gStepOn=" + gStepOn +
-                ", gRange='" + gRange + '\'' +
-                ", gWriteBfid=" + gWriteBfid +
-                ", gTextName='" + gTextName + '\'' +
-                ", gTestUrl='" + gTestUrl + '\'' +
-                ", gPhysicsPath='" + gPhysicsPath + '\'' +
-                ", gWriteGroup=" + gWriteGroup +
-                ", gOuterLink='" + gOuterLink + '\'' +
-                '}';
-    }
 }

src/main/java/com/hxgk/zxxy/model/entity/ManCont.java

@@ -0,0 +1,646 @@
+package com.hxgk.zxxy.model.entity;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * database:hr_new
+ * view:man_cont   (person_archives,personnel_content)
+ */
+@Repository
+public class ManCont {
+    //person_archives.id
+    private Long id;
+    //工号
+    private String number;
+    //姓名
+    private String name;
+    //头像
+    private String icon;
+    //雇佣类型（1：雇佣入职；2：再入职；）
+    private Byte hireClass;
+    //用工关系  1:临时工 , 2:编外人员 ;3:实习&实习生;4：试用员工；5：待分配；6：待岗；7：临时调入；
+    //8：正式员工；9：长期病假；10：停薪留职；11：退休；12：辞职；13：辞退；14：离职
+    private Byte empType;
+    //入职公司
+    private Long company;
+    //主部门
+    private Long maindeparment;
+    //部门
+    private String deparment;
+    //所属行政组织
+    private Long adminOrg;
+    //职位
+    private Long position;
+    //职务分类
+    private Long jobClass;
+    //职务
+    private Long jobId;
+    //职务等级
+    private Long jobLeve;
+    //写入时间
+    private Long time;
+    //编辑时间
+    private Long eiteTime;
+    //微信UserId
+    private String wechat;
+    //企业微信UserId
+    private String workWechat;
+    //状态（1：启用；2：禁用；3：删除）
+    private Byte state;
+    //key
+    private Long key;
+    //是否为管理员（1：不是；2：分公司；3：集团管理员；4：超级管)
+    private Byte isAdmin;
+    //密码
+    private String password;
+    //角色
+    private String role;
+    //身份证号
+    private String idcardno;
+    //护照号码
+    private String passportno;
+    //国际区号
+    private String globalroaming;
+    //手机号码
+    private String mobilephone;
+    //电子邮件
+    private String email;
+    //性别（1：男性；2：女性；3：中性）
+    private Byte gender;
+    //birthday
+    private Long birthday;
+    //民族
+    private String myfolk;
+    //籍贯
+    private String nativeplace;
+    //身份证有效期开始
+    private Long idcardstartdate;
+    //身份证有效期结束
+    private Long idcardenddate;
+    //身份证地址
+    private String idcardaddress;
+    //身份证签发机关
+    private String idcardIssued;
+    //健康状况（1：良好；2：一般；3：较弱，4：有生理缺陷；5：残废）
+    private Byte health;
+    //婚姻状况（1：未婚；2：已婚；3：丧偶；4：离异）
+    private Byte maritalstatus;
+    //内线电话
+    private String internaltelephone;
+    //现居住地址
+    private String currentresidence;
+    //星座（1：白羊座；2：金牛座；3：双子座；4：巨蟹座；5：狮子座；6：处女座；7：天枰座；8：天蝎座；9：射手座；10：摩羯座；11：水瓶座；12：双鱼座）
+    private Byte constellationing;
+    //是否双职工（1：是；2：否）
+    private Byte isdoubleworker;
+    //是否为退役军人（1：是；2：否）
+    private Byte isveterans;
+    //退役证编号
+    private String veteransnumber;
+    //参加工作日期
+    private Long jobstartdate;
+    //入职日期
+    private Long entrydate;
+    //试用期
+    private Integer probationperiod;
+    //预计转正日期
+    private Long planformaldate;
+    //政治面貌(1：群众；2：无党派；3：台盟会员；4：九三社员；5：致公党员；6：农工党员；7：民进会员；8：民建会员；9：民盟盟员；10：民革会员，11：共青团员；12：预备党员；13：中共党员)
+    private Byte politicalOutlook;
+    //二级部门
+    private Long sunMainDeparment;
+    //班组
+    private Long teamid;
+    //曾用名
+    private String nameUsedBefore;
+    //轮询规则
+    private Long ruleid;
+    //照片
+    private String iconPhoto;
+    //负责人（1：是；2：否）
+    private Integer personInCharge;
+    //负责的行政组织
+    private String responsibleDepartment;
+    //负责的行政组织json
+    private String responsibleDepartmentJson;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public Byte getHireClass() {
+        return hireClass;
+    }
+
+    public void setHireClass(Byte hireClass) {
+        this.hireClass = hireClass;
+    }
+
+    public Byte getEmpType() {
+        return empType;
+    }
+
+    public void setEmpType(Byte empType) {
+        this.empType = empType;
+    }
+
+    public Long getCompany() {
+        return company;
+    }
+
+    public void setCompany(Long company) {
+        this.company = company;
+    }
+
+    public Long getMaindeparment() {
+        return maindeparment;
+    }
+
+    public void setMaindeparment(Long maindeparment) {
+        this.maindeparment = maindeparment;
+    }
+
+    public String getDeparment() {
+        return deparment;
+    }
+
+    public void setDeparment(String deparment) {
+        this.deparment = deparment;
+    }
+
+    public Long getAdminOrg() {
+        return adminOrg;
+    }
+
+    public void setAdminOrg(Long adminOrg) {
+        this.adminOrg = adminOrg;
+    }
+
+    public Long getPosition() {
+        return position;
+    }
+
+    public void setPosition(Long position) {
+        this.position = position;
+    }
+
+    public Long getJobClass() {
+        return jobClass;
+    }
+
+    public void setJobClass(Long jobClass) {
+        this.jobClass = jobClass;
+    }
+
+    public Long getJobId() {
+        return jobId;
+    }
+
+    public void setJobId(Long jobId) {
+        this.jobId = jobId;
+    }
+
+    public Long getJobLeve() {
+        return jobLeve;
+    }
+
+    public void setJobLeve(Long jobLeve) {
+        this.jobLeve = jobLeve;
+    }
+
+    public Long getTime() {
+        return time;
+    }
+
+    public void setTime(Long time) {
+        this.time = time;
+    }
+
+    public Long getEiteTime() {
+        return eiteTime;
+    }
+
+    public void setEiteTime(Long eiteTime) {
+        this.eiteTime = eiteTime;
+    }
+
+    public String getWechat() {
+        return wechat;
+    }
+
+    public void setWechat(String wechat) {
+        this.wechat = wechat;
+    }
+
+    public String getWorkWechat() {
+        return workWechat;
+    }
+
+    public void setWorkWechat(String workWechat) {
+        this.workWechat = workWechat;
+    }
+
+    public Byte getState() {
+        return state;
+    }
+
+    public void setState(Byte state) {
+        this.state = state;
+    }
+
+    public Long getKey() {
+        return key;
+    }
+
+    public void setKey(Long key) {
+        this.key = key;
+    }
+
+    public Byte getIsAdmin() {
+        return isAdmin;
+    }
+
+    public void setIsAdmin(Byte isAdmin) {
+        this.isAdmin = isAdmin;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getRole() {
+        return role;
+    }
+
+    public void setRole(String role) {
+        this.role = role;
+    }
+
+    public String getIdcardno() {
+        return idcardno;
+    }
+
+    public void setIdcardno(String idcardno) {
+        this.idcardno = idcardno;
+    }
+
+    public String getPassportno() {
+        return passportno;
+    }
+
+    public void setPassportno(String passportno) {
+        this.passportno = passportno;
+    }
+
+    public String getGlobalroaming() {
+        return globalroaming;
+    }
+
+    public void setGlobalroaming(String globalroaming) {
+        this.globalroaming = globalroaming;
+    }
+
+    public String getMobilephone() {
+        return mobilephone;
+    }
+
+    public void setMobilephone(String mobilephone) {
+        this.mobilephone = mobilephone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Byte getGender() {
+        return gender;
+    }
+
+    public void setGender(Byte gender) {
+        this.gender = gender;
+    }
+
+    public Long getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Long birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getMyfolk() {
+        return myfolk;
+    }
+
+    public void setMyfolk(String myfolk) {
+        this.myfolk = myfolk;
+    }
+
+    public String getNativeplace() {
+        return nativeplace;
+    }
+
+    public void setNativeplace(String nativeplace) {
+        this.nativeplace = nativeplace;
+    }
+
+    public Long getIdcardstartdate() {
+        return idcardstartdate;
+    }
+
+    public void setIdcardstartdate(Long idcardstartdate) {
+        this.idcardstartdate = idcardstartdate;
+    }
+
+    public Long getIdcardenddate() {
+        return idcardenddate;
+    }
+
+    public void setIdcardenddate(Long idcardenddate) {
+        this.idcardenddate = idcardenddate;
+    }
+
+    public String getIdcardaddress() {
+        return idcardaddress;
+    }
+
+    public void setIdcardaddress(String idcardaddress) {
+        this.idcardaddress = idcardaddress;
+    }
+
+    public String getIdcardIssued() {
+        return idcardIssued;
+    }
+
+    public void setIdcardIssued(String idcardIssued) {
+        this.idcardIssued = idcardIssued;
+    }
+
+    public Byte getHealth() {
+        return health;
+    }
+
+    public void setHealth(Byte health) {
+        this.health = health;
+    }
+
+    public Byte getMaritalstatus() {
+        return maritalstatus;
+    }
+
+    public void setMaritalstatus(Byte maritalstatus) {
+        this.maritalstatus = maritalstatus;
+    }
+
+    public String getInternaltelephone() {
+        return internaltelephone;
+    }
+
+    public void setInternaltelephone(String internaltelephone) {
+        this.internaltelephone = internaltelephone;
+    }
+
+    public String getCurrentresidence() {
+        return currentresidence;
+    }
+
+    public void setCurrentresidence(String currentresidence) {
+        this.currentresidence = currentresidence;
+    }
+
+    public Byte getConstellationing() {
+        return constellationing;
+    }
+
+    public void setConstellationing(Byte constellationing) {
+        this.constellationing = constellationing;
+    }
+
+    public Byte getIsdoubleworker() {
+        return isdoubleworker;
+    }
+
+    public void setIsdoubleworker(Byte isdoubleworker) {
+        this.isdoubleworker = isdoubleworker;
+    }
+
+    public Byte getIsveterans() {
+        return isveterans;
+    }
+
+    public void setIsveterans(Byte isveterans) {
+        this.isveterans = isveterans;
+    }
+
+    public String getVeteransnumber() {
+        return veteransnumber;
+    }
+
+    public void setVeteransnumber(String veteransnumber) {
+        this.veteransnumber = veteransnumber;
+    }
+
+    public Long getJobstartdate() {
+        return jobstartdate;
+    }
+
+    public void setJobstartdate(Long jobstartdate) {
+        this.jobstartdate = jobstartdate;
+    }
+
+    public Long getEntrydate() {
+        return entrydate;
+    }
+
+    public void setEntrydate(Long entrydate) {
+        this.entrydate = entrydate;
+    }
+
+    public Integer getProbationperiod() {
+        return probationperiod;
+    }
+
+    public void setProbationperiod(Integer probationperiod) {
+        this.probationperiod = probationperiod;
+    }
+
+    public Long getPlanformaldate() {
+        return planformaldate;
+    }
+
+    public void setPlanformaldate(Long planformaldate) {
+        this.planformaldate = planformaldate;
+    }
+
+    public Byte getPoliticalOutlook() {
+        return politicalOutlook;
+    }
+
+    public void setPoliticalOutlook(Byte politicalOutlook) {
+        this.politicalOutlook = politicalOutlook;
+    }
+
+    public Long getSunMainDeparment() {
+        return sunMainDeparment;
+    }
+
+    public void setSunMainDeparment(Long sunMainDeparment) {
+        this.sunMainDeparment = sunMainDeparment;
+    }
+
+    public Long getTeamid() {
+        return teamid;
+    }
+
+    public void setTeamid(Long teamid) {
+        this.teamid = teamid;
+    }
+
+    public String getNameUsedBefore() {
+        return nameUsedBefore;
+    }
+
+    public void setNameUsedBefore(String nameUsedBefore) {
+        this.nameUsedBefore = nameUsedBefore;
+    }
+
+    public Long getRuleid() {
+        return ruleid;
+    }
+
+    public void setRuleid(Long ruleid) {
+        this.ruleid = ruleid;
+    }
+
+    public String getIconPhoto() {
+        return iconPhoto;
+    }
+
+    public void setIconPhoto(String iconPhoto) {
+        this.iconPhoto = iconPhoto;
+    }
+
+    public Integer getPersonInCharge() {
+        return personInCharge;
+    }
+
+    public void setPersonInCharge(Integer personInCharge) {
+        this.personInCharge = personInCharge;
+    }
+
+    public String getResponsibleDepartment() {
+        return responsibleDepartment;
+    }
+
+    public void setResponsibleDepartment(String responsibleDepartment) {
+        this.responsibleDepartment = responsibleDepartment;
+    }
+
+    public String getResponsibleDepartmentJson() {
+        return responsibleDepartmentJson;
+    }
+
+    public void setResponsibleDepartmentJson(String responsibleDepartmentJson) {
+        this.responsibleDepartmentJson = responsibleDepartmentJson;
+    }
+
+    @Override
+    public String toString() {
+        return "ManCont{" +
+                "id=" + id +
+                ", number='" + number + '\'' +
+                ", name='" + name + '\'' +
+                ", icon='" + icon + '\'' +
+                ", hireClass=" + hireClass +
+                ", empType=" + empType +
+                ", company=" + company +
+                ", maindeparment=" + maindeparment +
+                ", deparment='" + deparment + '\'' +
+                ", adminOrg=" + adminOrg +
+                ", position=" + position +
+                ", jobClass=" + jobClass +
+                ", jobId=" + jobId +
+                ", jobLeve=" + jobLeve +
+                ", time=" + time +
+                ", eiteTime=" + eiteTime +
+                ", wechat='" + wechat + '\'' +
+                ", workWechat='" + workWechat + '\'' +
+                ", state=" + state +
+                ", key=" + key +
+                ", isAdmin=" + isAdmin +
+                ", password='" + password + '\'' +
+                ", role='" + role + '\'' +
+                ", idcardno='" + idcardno + '\'' +
+                ", passportno='" + passportno + '\'' +
+                ", globalroaming='" + globalroaming + '\'' +
+                ", mobilephone='" + mobilephone + '\'' +
+                ", email='" + email + '\'' +
+                ", gender=" + gender +
+                ", birthday=" + birthday +
+                ", myfolk='" + myfolk + '\'' +
+                ", nativeplace='" + nativeplace + '\'' +
+                ", idcardstartdate=" + idcardstartdate +
+                ", idcardenddate=" + idcardenddate +
+                ", idcardaddress='" + idcardaddress + '\'' +
+                ", idcardIssued='" + idcardIssued + '\'' +
+                ", health=" + health +
+                ", maritalstatus=" + maritalstatus +
+                ", internaltelephone='" + internaltelephone + '\'' +
+                ", currentresidence='" + currentresidence + '\'' +
+                ", constellationing=" + constellationing +
+                ", isdoubleworker=" + isdoubleworker +
+                ", isveterans=" + isveterans +
+                ", veteransnumber='" + veteransnumber + '\'' +
+                ", jobstartdate=" + jobstartdate +
+                ", entrydate=" + entrydate +
+                ", probationperiod=" + probationperiod +
+                ", planformaldate=" + planformaldate +
+                ", politicalOutlook=" + politicalOutlook +
+                ", sunMainDeparment=" + sunMainDeparment +
+                ", teamid=" + teamid +
+                ", nameUsedBefore='" + nameUsedBefore + '\'' +
+                ", ruleid=" + ruleid +
+                ", iconPhoto='" + iconPhoto + '\'' +
+                ", personInCharge=" + personInCharge +
+                ", responsibleDepartment='" + responsibleDepartment + '\'' +
+                ", responsibleDepartmentJson='" + responsibleDepartmentJson + '\'' +
+                '}';
+    }
+}

src/main/java/com/hxgk/zxxy/model/entity/OrgAndManTree.java

@@ -0,0 +1,50 @@
+package com.hxgk.zxxy.model.entity;
+
+import org.springframework.stereotype.Repository;
+
+import java.lang.reflect.Array;
+import java.util.List;
+
+@Repository
+public class OrgAndManTree {
+
+    private String id;
+    private String label;
+    private String parentId;
+    private List<OrgAndManTree> children;
+
+
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public List<OrgAndManTree> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<OrgAndManTree> children) {
+        this.children = children;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+}

src/main/java/com/hxgk/zxxy/model/entity/OrgContType.java

@@ -2,6 +2,8 @@ package com.hxgk.zxxy.model.entity;
 
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public class OrgContType {
     private Long id;
@@ -11,7 +13,16 @@ public class OrgContType {
     private String typename;
     private Integer level;
     private Byte state;
+    private List<OrgAndManTree> persons;
+
 
+    public List<OrgAndManTree> getPersons() {
+        return persons;
+    }
+
+    public void setPersons(List<OrgAndManTree> persons) {
+        this.persons = persons;
+    }
 
     public Long getId() {
         return id;

src/main/java/com/hxgk/zxxy/model/request/ArchivesTypeRequest.java

@@ -5,6 +5,24 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 public class ArchivesTypeRequest {
     //@JsonProperty("at_parent_id")
     private String atParentId;
+    private String userkey;
+    private String usertoken;
+
+    public String getUserkey() {
+        return userkey;
+    }
+
+    public void setUserkey(String userkey) {
+        this.userkey = userkey;
+    }
+
+    public String getUsertoken() {
+        return usertoken;
+    }
+
+    public void setUsertoken(String usertoken) {
+        this.usertoken = usertoken;
+    }
 
     public String getAtParentId() {
         return atParentId;

src/main/java/com/hxgk/zxxy/service/ArchivesTypeService.java

@@ -7,5 +7,5 @@ import java.util.Map;
 
 public interface ArchivesTypeService {
 
-     List<ArchivesType> getZxxyArchivesType(long atParentId);
+     List<ArchivesType> getZxxyArchivesType(long atParentId,String userkey,String usertoken);
 }

src/main/java/com/hxgk/zxxy/service/GraphicformService.java

@@ -1,10 +1,13 @@
 package com.hxgk.zxxy.service;
 
+import com.github.pagehelper.PageInfo;
 import com.hxgk.zxxy.model.entity.Graphicform;
 import com.hxgk.zxxy.model.request.GraphicformRequest;
 
-import java.util.List;
+
 
 public interface GraphicformService {
-    List<Graphicform> queryListByParam(GraphicformRequest graphicformRequest) throws Exception;
+    PageInfo<Graphicform> queryListByParam(GraphicformRequest graphicformRequest) throws Exception;
+
+    PageInfo<Graphicform> getCarousel(GraphicformRequest graphicformRequest);
 }

src/main/java/com/hxgk/zxxy/service/HrService.java

@@ -1,5 +1,6 @@
 package com.hxgk.zxxy.service;
 
+import com.hxgk.zxxy.model.entity.OrgAndManTree;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -11,5 +12,5 @@ public interface HrService {
 
     List<Long> queryGWsId(Long adminorg) throws Exception;
 
-
+    OrgAndManTree getOrgAndManTree();
 }

src/main/java/com/hxgk/zxxy/service/LowCodeTransferService.java

@@ -0,0 +1,9 @@
+package com.hxgk.zxxy.service;
+
+import com.hxgk.zxxy.model.entity.Car;
+
+import java.util.ArrayList;
+
+public interface LowCodeTransferService {
+    ArrayList<Car> getCarList();
+}

src/main/java/com/hxgk/zxxy/service/UserService.java

@@ -1,7 +1,10 @@
 package com.hxgk.zxxy.service;
 
+import com.hxgk.zxxy.model.entity.ManCont;
+import com.hxgk.zxxy.model.entity.OrgAndManTree;
 import com.hxgk.zxxy.model.entity.UserDetail;
 
+import java.util.List;
 import java.util.Map;
 
 public interface UserService {
@@ -10,4 +13,8 @@ public interface UserService {
      * 根据usertoken和userkey从redis中获取user信息.
      */
     UserDetail getUserDetailFromRedis (Map<String, String> userInfo);
+
+    ManCont getManContByKey(String key);
+
+    List<OrgAndManTree> getManContListByAdminOrg(String adminOrg);
 }

src/main/java/com/hxgk/zxxy/service/impl/ArchivesTypeServiceImpl.java

@@ -1,25 +1,72 @@
 package com.hxgk.zxxy.service.impl;
 
 import com.hxgk.zxxy.mapper.ArchivesTypeMapper;
+import com.hxgk.zxxy.mapper.GraphicformMapper;
 import com.hxgk.zxxy.model.entity.ArchivesType;
+import com.hxgk.zxxy.model.entity.UserDetail;
 import com.hxgk.zxxy.service.ArchivesTypeService;
+import com.hxgk.zxxy.service.HrService;
+import com.hxgk.zxxy.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class ArchivesTypeServiceImpl implements ArchivesTypeService {
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(ArchivesTypeServiceImpl.class);
+    //private static final Logger logger = LoggerFactory.getLogger(this.getClass());
     @Autowired
     private ArchivesTypeMapper archivesTypeMapper;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private HrService hrService;
+    @Autowired
+    private GraphicformMapper graphicformMapper;
+
 
     /**
      * 根据atParentId获取知行学院的navi列表
+     *
      * @param atParentId
      * @return
      */
     @Override
-    public List<ArchivesType> getZxxyArchivesType(long atParentId) {
+    public List<ArchivesType> getZxxyArchivesType(long atParentId, String userkey, String usertoken) {
-        return archivesTypeMapper.getZxxyArchivesType(atParentId);
+        String atParentIdStr = Long.toString(atParentId);
+        Map<String, String> userInfo = new HashMap<>();
+        userInfo.put("userkey", userkey);
+        userInfo.put("usertoken", usertoken);
+        UserDetail userDetail = userService.getUserDetailFromRedis(userInfo);
+        //去Hr中查询分厂(部门)和工段,工段可能是list(如果该用户层级较高,则拥有多个工段的权限.)当该用户层级低时,需向上查询他的上级机构码
+        List<Long> gBfIdList = hrService.queryGBfId(userDetail.getAdminorg());
+        //工段(list)
+        List<Long> gWsIdList = null;
+        try {
+            gWsIdList = hrService.queryGWsId(userDetail.getAdminorg());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        List<ArchivesType> list = archivesTypeMapper.getZxxyArchivesType(atParentId);
+        Iterator<ArchivesType> iterator = list.iterator();
+        while (iterator.hasNext()) {
+            ArchivesType a = iterator.next();
+            int count = graphicformMapper
+                    .queryCountByParam(atParentIdStr, a.getAtId(), gBfIdList, gWsIdList, userDetail.getWmKey());
+            if (count > 0) {
+                a.setHasCard(true);
+            } else {
+                a.setHasCard(false);
+                iterator.remove();//使用迭代器的删除方法删除
+            }
+        }
+        log.error("测试SLF4J---error");
+        log.warn("测试SLF4J---warn");
+        log.info("测试SLF4J---info");
+        return list;
     }
 }

src/main/java/com/hxgk/zxxy/service/impl/GraphicformServiceImpl.java

@@ -28,7 +28,7 @@ public class GraphicformServiceImpl implements GraphicformService {
 
     @DS("readdocument")
     @Override
-    public List<Graphicform> queryListByParam(GraphicformRequest graphicformRequest) throws Exception {
+    public PageInfo<Graphicform> queryListByParam(GraphicformRequest graphicformRequest) throws Exception {
         Map<String, String> userInfo = new HashMap<>();
         userInfo.put("userkey",graphicformRequest.getUserkey());
         userInfo.put("usertoken",graphicformRequest.getUsertoken());
@@ -42,6 +42,30 @@ public class GraphicformServiceImpl implements GraphicformService {
         List<Graphicform> graphicforms = graphicformMapper
                 .queryListByParam(graphicformRequest.getArchivesTypeAtParentId(),graphicformRequest.getgParentSun(), gBfIdList, gWsIdList,  Long.parseLong(graphicformRequest.getKey()));
         PageInfo<Graphicform> pageInfo = new PageInfo<Graphicform>(graphicforms);
-        return pageInfo.getList();
+        return pageInfo;
+    }
+
+    @Override
+    public PageInfo<Graphicform> getCarousel(GraphicformRequest graphicformRequest) {
+
+        Map<String, String> userInfo = new HashMap<>();
+        userInfo.put("userkey",graphicformRequest.getUserkey());
+        userInfo.put("usertoken",graphicformRequest.getUsertoken());
+        UserDetail userDetail = userService.getUserDetailFromRedis(userInfo);
+        //去Hr中查询分厂(部门)和工段,工段可能是list(如果该用户层级较高,则拥有多个工段的权限.)当该用户层级低时,需向上查询他的上级机构码
+        List<Long> gBfIdList = hrService.queryGBfId( userDetail.getAdminorg());
+        //工段(list)
+        List<Long> gWsIdList = null;
+        try {
+            gWsIdList = hrService.queryGWsId( userDetail.getAdminorg());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //开启分页
+        PageHelper.startPage(graphicformRequest.getPage(), 4);
+        List<Graphicform> graphicforms = graphicformMapper
+                .queryCarousel(graphicformRequest.getArchivesTypeAtParentId(),graphicformRequest.getgParentSun(), gBfIdList, gWsIdList,  Long.parseLong(graphicformRequest.getKey()));
+        PageInfo<Graphicform> pageInfo = new PageInfo<Graphicform>(graphicforms);
+        return pageInfo;
     }
 }

src/main/java/com/hxgk/zxxy/service/impl/HrServiceImpl.java

@@ -1,14 +1,23 @@
 package com.hxgk.zxxy.service.impl;
 
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hxgk.zxxy.mapper.OrgContTypeMapper;
+import com.hxgk.zxxy.model.entity.OrgAndManTree;
 import com.hxgk.zxxy.model.entity.OrgContType;
 import com.hxgk.zxxy.service.HrService;
+import com.hxgk.zxxy.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * 分厂条件,level=1,2时,要用in,他要看下属的所有分厂,要查出下属所有分厂的id,3时为adminorg,456时要向上查他隶属的分厂
@@ -20,9 +29,12 @@ import java.util.List;
 @DS("hrnew")
 public class HrServiceImpl implements HrService {
 
-
+    @Autowired
+    UserService userService;
     @Autowired
     OrgContTypeMapper orgContTypeMapper;
+    @Autowired
+    private StringRedisTemplate redisTemplate;
 
 
     //根据id查分厂
@@ -30,7 +42,14 @@ public class HrServiceImpl implements HrService {
     //备煤,机焦表里是车间,level5,但是要当成部门,level4,我查时,向上向下查询时,如果adminorg in[282,115],则说明他是机焦或者备煤,他level看作4
     @Override
     public List<Long> queryGBfId(Long adminorg) {
-        adminorg = 313L;
+        if(null!=adminorg){
+            System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqueryGBfId:"+adminorg);
+        }else{
+            System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqueryGBfId:adminorg_is_null");
+        }
+        //adminorg = 313L;//恒信集团
+        //adminorg = 102L;//高科企管部
+        //adminorg = 309L;//高科
         OrgContType orgContType = queryOrgContTypeByAdminorg(adminorg);
         Integer level = orgContType.getLevel();
         List<Long> gBfIdList = new ArrayList<Long>();
@@ -60,8 +79,10 @@ public class HrServiceImpl implements HrService {
     //备煤,机焦表里是车间,level5,但是要当成部门,level4,我查时,向上向下查询时,如果adminorg in[282,115],则说明他是机焦或者备煤,他level看作4
     //如果当前org的superior(父级)为115或282(备煤或机焦),则当前org即可能是level6,也可能是level5,如果是level6,则加入list,如果是level5则继续查询
     @Override
-    public List<Long> queryGWsId(Long adminorg) throws Exception {
+    public List<Long> queryGWsId(Long adminorg) {
-        adminorg = 313L;
+        //adminorg = 313L;//恒信集团
+        //adminorg = 102L;//高科企管部
+        //adminorg = 309L;//高科
         List<Long> gGWsIdList = new ArrayList<Long>();
         OrgContType orgContType = queryOrgContTypeByAdminorg(adminorg);
         Integer level = orgContType.getLevel();
@@ -77,6 +98,98 @@ public class HrServiceImpl implements HrService {
 
         return gGWsIdList;
     }
+    //低代码穿梭框组织人员树
+    @Override
+    public OrgAndManTree getOrgAndManTree() {
+
+        //先从redis里查一下看看有没有有则直接返回
+        if(redisTemplate.hasKey("orgTree_309_102")){
+            String orgTreeStr = redisTemplate.opsForValue().get("orgTree_309_102").toString();
+            OrgAndManTree o = JSON.parseObject(orgTreeStr, OrgAndManTree.class);
+            return o;
+        }else{
+            ArrayList<OrgContType> allWsList = new ArrayList();
+            ArrayList<OrgAndManTree> orgAndManTreeList = new ArrayList();
+
+            Long adminorg = 309L;//高科企管部
+            //Long adminorg = 312L;//高科
+
+            OrgContType orgContType = queryOrgContTypeByAdminorg(adminorg);
+            findAllUnder(orgContType,allWsList);
+            OrgAndManTree orgAndManTree = new OrgAndManTree();
+            String pid = "";
+            //构造OrgAndManTreeList
+            ArrayList<Long> Id_allWsList = new ArrayList<>();
+            for (OrgContType org  : allWsList) {
+                Id_allWsList.add(org.getId());
+                OrgAndManTree orgAndManTree1 = new OrgAndManTree();
+                orgAndManTree1.setId(org.getId().toString());
+                orgAndManTree1.setParentId(org.getSuperior().toString());
+                orgAndManTree1.setLabel(org.getName());
+                if(org.getPersons()!=null&&org.getPersons().size()>0){
+                    orgAndManTree1.setChildren(org.getPersons());
+                }
+                orgAndManTreeList.add(orgAndManTree1);
+
+            }
+            for (OrgContType org  : allWsList) {
+                if(!Id_allWsList.contains(org.getSuperior())){
+                    pid = org.getSuperior().toString();
+                }
+            }
+            //org的superior不在Id_allWsList中或org的superior==0,===>根节点.确定根节点的level.
+            if(pid!=null&&pid!=""){
+                recursionListToTree(orgAndManTreeList,pid);
+            }
+            for (OrgAndManTree dept : orgAndManTreeList) {
+                if(dept.getId().equals("102")){//309高科 102企管
+                    orgAndManTree = dept;
+                }
+            }
+            String orgAndManTree_Json= JSON.toJSONString(orgAndManTree);
+            redisTemplate.opsForValue().set("orgTree_309_102", orgAndManTree_Json, 1, TimeUnit.DAYS);
+            return orgAndManTree;
+        }
+
+    }
+
+    /**
+     * 递归方法把传过来的list转为tree
+     *
+
+     */
+    public List<OrgAndManTree> recursionListToTree(List<OrgAndManTree> list, String pId) {
+        List<OrgAndManTree> nodes = new ArrayList<>();
+        for (OrgAndManTree node : list) {
+            // 找出父节点
+            if (pId.equals(node.getParentId())) {
+                // 调用递归方法填充子节点列表
+                nodes.add(this.findChildren(node, list));
+            }
+        }
+        return nodes;
+    }
+    /**
+     * 递归方法
+     *
+     * @param tree     父节点对象
+     * @param treeList 所有的List
+     * @return
+     */
+    public OrgAndManTree findChildren(OrgAndManTree tree, List<OrgAndManTree> treeList) {
+        for (OrgAndManTree node : treeList) {
+            if (tree.getId().equals(node.getParentId())) {
+                if (CollectionUtils.isEmpty(tree.getChildren())) {
+                    tree.setChildren(new ArrayList<>());
+                }
+                // 递归 调用自身
+                tree.getChildren().add(this.findChildren(node, treeList));
+            }
+        }
+        return tree;
+    }
+
+
 
 
     /**
@@ -118,8 +231,13 @@ public class HrServiceImpl implements HrService {
         Long superior = orgContType.getSuperior();
         OrgContType superiorOrg = queryOrgContTypeByAdminorg(superior);
         //父级不是分厂
-        if (superiorOrg.getLevel() != 3) {
+        if (superiorOrg.getLevel() != 3) {//4直接跳到2或1,0的情况?  他肯定是从大的数越来越小
-            return queryHighFacId(superiorOrg);
+            if(superiorOrg.getLevel() > 3){
+                return queryHighFacId(superiorOrg);
+            }else{//小于3的情况
+                return superiorOrg;
+            }
+            //return queryHighFacId(superiorOrg);
         } else {
             return superiorOrg;
         }
@@ -141,6 +259,12 @@ public class HrServiceImpl implements HrService {
                 allWsList.add(list.get(i));
                 findAllUnder(list.get(i), allWsList);
             }
+        }else{//说明当前org是最子级组织
+            //查询该org下的所有人员
+            if(org.getId()!=null){
+                org.setPersons(userService.getManContListByAdminOrg(org.getId().toString()));
+            }
+
         }
 
     }

src/main/java/com/hxgk/zxxy/service/impl/LowCodeTransferServiceImpl.java

@@ -0,0 +1,22 @@
+package com.hxgk.zxxy.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hxgk.zxxy.mapper.LowCodeTransferMapper;
+import com.hxgk.zxxy.model.entity.Car;
+import com.hxgk.zxxy.service.LowCodeTransferService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+@Service
+public class LowCodeTransferServiceImpl implements LowCodeTransferService {
+    @Autowired
+    private Car car;
+    @Autowired
+    LowCodeTransferMapper lowCodeTransferMapper;
+    @Override
+    @DS("lowcodetest")
+    public ArrayList<Car> getCarList() {
+        return lowCodeTransferMapper.getCarList();
+    }
+}

src/main/java/com/hxgk/zxxy/service/impl/UserServiceImpl.java

@@ -1,5 +1,9 @@
 package com.hxgk.zxxy.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hxgk.zxxy.mapper.UserMapper;
+import com.hxgk.zxxy.model.entity.ManCont;
+import com.hxgk.zxxy.model.entity.OrgAndManTree;
 import com.hxgk.zxxy.model.entity.UserDetail;
 import com.hxgk.zxxy.service.UserService;
 import org.apache.commons.lang3.StringUtils;
@@ -8,6 +12,7 @@ import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -16,6 +21,8 @@ public class UserServiceImpl implements UserService {
     private UserDetail userDetail1;
     @Autowired
     private StringRedisTemplate redisTemplate;
+    @Autowired
+    private UserMapper userMapper;
 
     /**
      * 从redis中根据userkey和usertoken获取userDetail
@@ -78,4 +85,24 @@ public class UserServiceImpl implements UserService {
 
         return userDetail;
     }
+    @DS("hrnew")
+    @Override
+    public ManCont getManContByKey(String key) {
+        System.out.println("1");
+        return userMapper.getManContByKey(key);
+
+    }
+    @DS("hrnew")
+    @Override
+    public List<OrgAndManTree> getManContListByAdminOrg(String adminOrg) {
+        List<OrgAndManTree> manConts = userMapper.getManContListByAdminOrg(adminOrg);
+        /*for (int i = 0; i < manConts.size(); i++) {
+            if(!manConts.get(i).getNumber().chars().anyMatch(Character::isLetter)){
+                manConts.get(i).setId(Long.parseLong(manConts.get(i).getNumber()));
+            }
+        }*/
+        return manConts;
+    }
+
+
 }

src/main/resources/application-dev.yml

@@ -0,0 +1,117 @@
+mybatis:
+  configuration:
+    #开启控制台打印sql
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # mybatis 下划线转驼峰配置,两者都可以
+    map-underscore-to-camel-case: true
+  #配置扫描
+  mapper-locations: classpath:mapper/*.xml
+  #配置xml的结果别名
+  type-aliases-package: com.hxgk.zxxy.model.entity
+spring:
+  autoconfigure:
+    #去除durid配置
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  #MySQL druid多数据源配置（纯粹多库）
+  datasource:
+    dynamic:
+      datasource:
+        hengxingaoketes:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: rjwi58B6zYCHMbGZ
+          #url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          url: jdbc:mysql://172.20.2.87:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: hengxingaoke_tes
+        hrnew:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: AnknKiXiXaxNrw78
+          #url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          url: jdbc:mysql://172.20.2.87:3306/hr_new?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: hr_new
+        leaguetabledata:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: e0eb142add
+          #url: jdbc:mysql://127.0.0.1:3306/league_table_data?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          url: jdbc:mysql://172.20.2.87:3306/league_table_data?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: league_table_data
+        learnmessage:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: 3bdd844687
+          #url: jdbc:mysql://127.0.0.1:3306/learn_message?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          url: jdbc:mysql://172.20.2.87:3306/learn_message?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: learn_message
+        quesandanswers:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: c8caf5d256
+          #url: jdbc:mysql://127.0.0.1:3306/ques_and_answers?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          url: jdbc:mysql://172.20.2.87:3306/ques_and_answers?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: ques_and_answers
+        readdocument:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: f2c943d2ab
+          #url: jdbc:mysql://127.0.0.1:3306/readdocument?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          url: jdbc:mysql://172.20.2.87:3306/readdocument?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: readdocument
+        selftestdatabase:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: 6755319456
+          #url: jdbc:mysql://127.0.0.1:3306/selftestdatabase?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          url: jdbc:mysql://172.20.2.87:3306/selftestdatabase?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: selftestdatabase
+        statisticsing:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: 19c66cdb65
+          #url: jdbc:mysql://127.0.0.1:3306/statisticsing?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          url: jdbc:mysql://172.20.2.87:3306/statisticsing?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: statisticsing
+        wrongquestionbank:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: 7f7ac6c8f5
+          #url: jdbc:mysql://127.0.0.1:3306/wrong_question_bank?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          url: jdbc:mysql://172.20.2.87:3306/wrong_question_bank?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: wrong_question_bank
+        lowcodetest:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: root
+          url: jdbc:mysql://127.0.0.1:3306/lowcode_test?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: root
+      #数据源基础配置
+      druid:
+        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+        connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+        filters: stat,wall
+        initial-size: 5
+        max-active: 20
+        #指定每个连接上PSCache的大小
+        max-pool-prepared-statement-per-connection-size: 20
+        # 配置获取连接等待超时的时间
+        max-wait: 6000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        min-evictable-idle-time-millis: 300000
+        min-idle: 5
+        # 打开PSCache
+        pool-prepared-statements: true
+        test-on-borrow: false
+        test-on-return: false
+        test-while-idle: true
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        time-between-eviction-runs-millis: 60000
+        validation-query: 'SELECT 1 FROM DUAL '
+      #指定默认数据源(必须配置)
+      primary: hengxingaoketes
+      #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
+      strict: false
+  redis:
+    database: 5
+    #host: 127.0.0.1
+    host: 172.20.5.57
+    lettuce:
+      pool:
+        max-active: 10
+        max-idle: 10
+        max-wait: -1ms
+        min-idle: 0
+    port: 6379
+    password: Redis+brngJ3U19@8_Z2^7a
+    timeout: 10000

src/main/resources/application-prod.yml

@@ -0,0 +1,111 @@
+mybatis:
+  configuration:
+    #开启控制台打印sql
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # mybatis 下划线转驼峰配置,两者都可以
+    map-underscore-to-camel-case: true
+  #配置扫描
+  mapper-locations: classpath:mapper/*.xml
+  #配置xml的结果别名
+  type-aliases-package: com.hxgk.zxxy.model.entity
+spring:
+  autoconfigure:
+    #去除durid配置
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  #MySQL druid多数据源配置（纯粹多库）
+  datasource:
+    dynamic:
+      datasource:
+        hengxingaoketes:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: rjwi58B6zYCHMbGZ
+          url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: hengxingaoke_tes
+        hrnew:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: AnknKiXiXaxNrw78
+          url: jdbc:mysql://127.0.0.1:3306/hr_new?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/hr_new?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: hr_new
+        leaguetabledata:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: e0eb142add
+          url: jdbc:mysql://127.0.0.1:3306/league_table_data?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/league_table_data?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: league_table_data
+        learnmessage:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: 3bdd844687
+          #url: jdbc:mysql://127.0.0.1:3306/learn_message?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          url: jdbc:mysql://172.20.2.87:3306/learn_message?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: learn_message
+        quesandanswers:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: c8caf5d256
+          url: jdbc:mysql://127.0.0.1:3306/ques_and_answers?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/ques_and_answers?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: ques_and_answers
+        readdocument:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: f2c943d2ab
+          url: jdbc:mysql://127.0.0.1:3306/readdocument?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/readdocument?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: readdocument
+        selftestdatabase:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: 6755319456
+          url: jdbc:mysql://127.0.0.1:3306/selftestdatabase?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/selftestdatabase?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: selftestdatabase
+        statisticsing:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: 19c66cdb65
+          url: jdbc:mysql://127.0.0.1:3306/statisticsing?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/statisticsing?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: statisticsing
+        wrongquestionbank:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: 7f7ac6c8f5
+          url: jdbc:mysql://127.0.0.1:3306/wrong_question_bank?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/wrong_question_bank?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: wrong_question_bank
+      #数据源基础配置
+      druid:
+        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+        connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+        filters: stat,wall
+        initial-size: 5
+        max-active: 20
+        #指定每个连接上PSCache的大小
+        max-pool-prepared-statement-per-connection-size: 20
+        # 配置获取连接等待超时的时间
+        max-wait: 6000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        min-evictable-idle-time-millis: 300000
+        min-idle: 5
+        # 打开PSCache
+        pool-prepared-statements: true
+        test-on-borrow: false
+        test-on-return: false
+        test-while-idle: true
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        time-between-eviction-runs-millis: 60000
+        validation-query: 'SELECT 1 FROM DUAL '
+      #指定默认数据源(必须配置)
+      primary: hengxingaoketes
+      #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
+      strict: false
+  redis:
+    database: 5
+    host: 172.20.5.57
+    lettuce:
+      pool:
+        max-active: 10
+        max-idle: 10
+        max-wait: -1ms
+        min-idle: 0
+    port: 6379
+    password: Redis+brngJ3U19@8_Z2^7a
+    timeout: 10000

src/main/resources/application-prodout.yml

@@ -0,0 +1,116 @@
+mybatis:
+  configuration:
+    #开启控制台打印sql
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # mybatis 下划线转驼峰配置,两者都可以
+    map-underscore-to-camel-case: true
+  #配置扫描
+  mapper-locations: classpath:mapper/*.xml
+  #配置xml的结果别名
+  type-aliases-package: com.hxgk.zxxy.model.entity
+spring:
+  autoconfigure:
+    #去除durid配置
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  #MySQL druid多数据源配置（纯粹多库）
+  datasource:
+    dynamic:
+      datasource:
+        hengxingaoketes:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: JsTt6iTpkZ85wDnF
+          url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: hengxingaoke_tes
+        #hrnew:
+          #driver-class-name: com.mysql.cj.jdbc.Driver
+          #password: AnknKiXiXaxNrw78
+          #url: jdbc:mysql://120.224.6.6:6666/hr_new?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #username: hr_new
+        hrnew:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: kPMP6NafMsdccxDX
+          #url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          url: jdbc:mysql://127.0.0.1:3306/hr_new?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: hr_new
+        leaguetabledata:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: e0eb142add
+          url: jdbc:mysql://120.224.6.6:16666/league_table_data?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/league_table_data?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: league_table_data
+        learnmessage:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: 3bdd844687
+          #url: jdbc:mysql://127.0.0.1:3306/learn_message?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          url: jdbc:mysql://120.224.6.6:16666/learn_message?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: learn_message
+        quesandanswers:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: c8caf5d256
+          url: jdbc:mysql://120.224.6.6:16666/ques_and_answers?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/ques_and_answers?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: ques_and_answers
+        readdocument:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: CY2yanCmAP8p8bxj
+          url: jdbc:mysql://127.0.0.1:3306/readdocument?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/readdocument?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: readdocument
+        selftestdatabase:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: 6755319456
+          url: jdbc:mysql://120.224.6.6:16666/selftestdatabase?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/selftestdatabase?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: selftestdatabase
+        statisticsing:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: 19c66cdb65
+          url: jdbc:mysql://120.224.6.6:16666/statisticsing?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/statisticsing?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: statisticsing
+        wrongquestionbank:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          password: 7f7ac6c8f5
+          url: jdbc:mysql://120.224.6.6:16666/wrong_question_bank?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          #url: jdbc:mysql://172.20.2.87:3306/wrong_question_bank?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+          username: wrong_question_bank
+      #数据源基础配置
+      druid:
+        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+        connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+        filters: stat,wall
+        initial-size: 5
+        max-active: 20
+        #指定每个连接上PSCache的大小
+        max-pool-prepared-statement-per-connection-size: 20
+        # 配置获取连接等待超时的时间
+        max-wait: 6000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        min-evictable-idle-time-millis: 300000
+        min-idle: 5
+        # 打开PSCache
+        pool-prepared-statements: true
+        test-on-borrow: false
+        test-on-return: false
+        test-while-idle: true
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        time-between-eviction-runs-millis: 60000
+        validation-query: 'SELECT 1 FROM DUAL '
+      #指定默认数据源(必须配置)
+      primary: hengxingaoketes
+      #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
+      strict: false
+  redis:
+    database: 5
+    host: 127.0.0.1
+    lettuce:
+      pool:
+        max-active: 10
+        max-idle: 10
+        max-wait: -1ms
+        min-idle: 0
+    port: 6379
+    timeout: 10000

src/main/resources/application.properties

@@ -1,127 +0,0 @@
-
-server.port=8088
-
-
-###MySQL druid多数据源配置（纯粹多库）###
-#去除durid配置
-spring.autoconfigure.exclude=com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-#指定默认数据源(必须配置)
-spring.datasource.dynamic.primary=hengxingaoketes
-#设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
-spring.datasource.dynamic.strict=false
-
-spring.datasource.dynamic.datasource.hengxingaoketes.url=jdbc:mysql://172.20.2.87:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
-spring.datasource.dynamic.datasource.hengxingaoketes.username=hengxingaoke_tes
-spring.datasource.dynamic.datasource.hengxingaoketes.password=rjwi58B6zYCHMbGZ
-spring.datasource.dynamic.datasource.hengxingaoketes.driver-class-name=com.mysql.cj.jdbc.Driver
-
-spring.datasource.dynamic.datasource.leaguetabledata.url=jdbc:mysql://172.20.2.87:3306/league_table_data?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
-spring.datasource.dynamic.datasource.leaguetabledata.username=league_table_data
-spring.datasource.dynamic.datasource.leaguetabledata.password=e0eb142add
-spring.datasource.dynamic.datasource.leaguetabledata.driver-class-name=com.mysql.cj.jdbc.Driver
-
-spring.datasource.dynamic.datasource.statisticsing.url=jdbc:mysql://172.20.2.87:3306/statisticsing?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
-spring.datasource.dynamic.datasource.statisticsing.username=statisticsing
-spring.datasource.dynamic.datasource.statisticsing.password=19c66cdb65
-spring.datasource.dynamic.datasource.statisticsing.driver-class-name=com.mysql.cj.jdbc.Driver
-
-spring.datasource.dynamic.datasource.quesandanswers.url=jdbc:mysql://172.20.2.87:3306/ques_and_answers?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
-spring.datasource.dynamic.datasource.quesandanswers.username=ques_and_answers
-spring.datasource.dynamic.datasource.quesandanswers.password=c8caf5d256
-spring.datasource.dynamic.datasource.quesandanswers.driver-class-name=com.mysql.cj.jdbc.Driver
-
-spring.datasource.dynamic.datasource.learnmessage.url=jdbc:mysql://172.20.2.87:3306/learn_message?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
-spring.datasource.dynamic.datasource.learnmessage.username=learn_message
-spring.datasource.dynamic.datasource.learnmessage.password=3bdd844687
-spring.datasource.dynamic.datasource.learnmessage.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/online_xdclass?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.dynamic.datasource.wrongquestionbank.url=jdbc:mysql://172.20.2.87:3306/wrong_question_bank?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
-spring.datasource.dynamic.datasource.wrongquestionbank.username=wrong_question_bank
-spring.datasource.dynamic.datasource.wrongquestionbank.password=7f7ac6c8f5
-spring.datasource.dynamic.datasource.wrongquestionbank.driver-class-name=com.mysql.cj.jdbc.Driver
-
-spring.datasource.dynamic.datasource.selftestdatabase.url=jdbc:mysql://172.20.2.87:3306/selftestdatabase?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
-spring.datasource.dynamic.datasource.selftestdatabase.username=selftestdatabase
-spring.datasource.dynamic.datasource.selftestdatabase.password=6755319456
-spring.datasource.dynamic.datasource.selftestdatabase.driver-class-name=com.mysql.cj.jdbc.Driver
-
-
-spring.datasource.dynamic.datasource.readdocument.url=jdbc:mysql://172.20.2.87:3306/readdocument?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
-spring.datasource.dynamic.datasource.readdocument.username=readdocument
-spring.datasource.dynamic.datasource.readdocument.password=f2c943d2ab
-spring.datasource.dynamic.datasource.readdocument.driver-class-name=com.mysql.cj.jdbc.Driver
-
-
-spring.datasource.dynamic.datasource.hrnew.url=jdbc:mysql://172.20.2.87:3306/hr_new?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
-spring.datasource.dynamic.datasource.hrnew.username=hr_new
-spring.datasource.dynamic.datasource.hrnew.password=AnknKiXiXaxNrw78
-spring.datasource.dynamic.datasource.hrnew.driver-class-name=com.mysql.cj.jdbc.Driver
-
-
-#数据源基础配置
-spring.datasource.dynamic.druid.initial-size=5
-spring.datasource.dynamic.druid.min-idle=5
-spring.datasource.dynamic.druid.max-active=20
-# 配置获取连接等待超时的时间
-spring.datasource.dynamic.druid.max-wait=6000
-# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-spring.datasource.dynamic.druid.time-between-eviction-runs-millis=60000
-# 配置一个连接在池中最小生存的时间，单位是毫秒
-spring.datasource.dynamic.druid.min-evictable-idle-time-millis=300000
-spring.datasource.dynamic.druid.validation-query=SELECT 1 FROM DUAL 
-spring.datasource.dynamic.druid.test-while-idle=true
-spring.datasource.dynamic.druid.test-on-borrow=false
-spring.datasource.dynamic.druid.test-on-return=false
-# 打开PSCache，并且指定每个连接上PSCache的大小
-spring.datasource.dynamic.druid.pool-prepared-statements=true
-spring.datasource.dynamic.druid.max-pool-prepared-statement-per-connection-size=20
-# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-spring.datasource.dynamic.druid.filters=stat,wall
-# 通过connectProperties属性来打开mergeSql功能；慢SQL记录
-spring.datasource.dynamic.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-
-
-
-
-#Redis
-#spring.redis.host=127.0.0.1
-spring.redis.host=127.0.0.1
-spring.redis.database=5
-## Redis服务器连接端口
-spring.redis.port=6379
-## 连接超时时间（毫秒）
-#spring.redis.timeout=10000
-## Redis服务器连接密码（默认为空）
-#spring.redis.password=123456
-## 连接池中的最大连接数
-#spring.redis.poolMaxTotal=10
-## 连接池中的最大空闲连接
-#spring.redis.poolMaxIdle=10
-## 连接池最大阻塞等待时间（使用负值表示没有限制）
-#redis.poolMaxWait=3
-
-
-# 连接池最?连接数（使?负值表示没有限制）
-spring.redis.lettuce.pool.max-active = 10
-# 连接池中的最?空闲连接
-spring.redis.lettuce.pool.max-idle = 10
-# 连接池中的最?空闲连接
-spring.redis.lettuce.pool.min-idle = 0
-# 连接池最?阻塞等待时间（使?负值表示没有限制）
-spring.redis.lettuce.pool.max-wait= -1ms
-
-
-#开启控制台打印sql
-mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-
-# mybatis 下划线转驼峰配置,两者都可以
-#mybatis.configuration.mapUnderscoreToCamelCase=true
-mybatis.configuration.map-underscore-to-camel-case=true
-#配置扫描
-mybatis.mapper-locations=classpath:mapper/*.xml
-
-#配置xml的结果别名
-mybatis.type-aliases-package=com.hxgk.zxxy.model.entity
-
-
-

src/main/resources/application.yml

@@ -0,0 +1,5 @@
+spring:
+  profiles:
+    active: prodout
+server:
+  port: 8111

src/main/resources/log4j2-spring.xml

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出-->
+<!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数-->
+<configuration monitorInterval="5">
+    <!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
+
+    <!--变量配置-->
+    <Properties>
+        <!-- 格式化输出：%date表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度 %msg：日志消息，%n是换行符-->
+        <!-- %logger{36} 表示 Logger 名字最长36个字符 -->
+        <property name="LOG_PATTERN" value="%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n" />
+        <!-- 定义日志存储的路径 -->
+        <property name="FILE_PATH" value="logs" /><!--日志路径-->
+        <property name="FILE_NAME" value="zxxy" /><!--项目名-->
+    </Properties>
+
+    <appenders>
+
+        <console name="Console" target="SYSTEM_OUT">
+            <!--输出日志的格式-->
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+            <!--控制台只输出level及其以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
+            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
+        </console>
+
+        <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，适合临时测试用-->
+        <File name="Filelog" fileName="${FILE_PATH}/test.log" append="false">
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+        </File>
+
+        <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
+        <RollingFile name="RollingFileInfo" fileName="${FILE_PATH}/info.log" filePattern="${FILE_PATH}/${FILE_NAME}-INFO-%d{yyyy-MM-dd}_%i.log.gz">
+            <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
+            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+            <Policies>
+                <!--interval属性用来指定多久滚动一次，默认是1 hour-->
+                <TimeBasedTriggeringPolicy interval="1"/>
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件开始覆盖-->
+            <DefaultRolloverStrategy max="1500"/>
+        </RollingFile>
+
+        <!-- 这个会打印出所有的warn及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
+        <RollingFile name="RollingFileWarn" fileName="${FILE_PATH}/warn.log" filePattern="${FILE_PATH}/${FILE_NAME}-WARN-%d{yyyy-MM-dd}_%i.log.gz">
+            <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
+            <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+            <Policies>
+                <!--interval属性用来指定多久滚动一次，默认是1 hour-->
+                <TimeBasedTriggeringPolicy interval="1"/>
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件开始覆盖-->
+            <DefaultRolloverStrategy max="1500"/>
+        </RollingFile>
+
+        <!-- 这个会打印出所有的error及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
+        <RollingFile name="RollingFileError" fileName="${FILE_PATH}/error.log" filePattern="${FILE_PATH}/${FILE_NAME}-ERROR-%d{yyyy-MM-dd}_%i.log.gz">
+            <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
+            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+            <Policies>
+                <!--interval属性用来指定多久滚动一次，默认是1 hour-->
+                <TimeBasedTriggeringPolicy interval="1"/>
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件开始覆盖-->
+            <DefaultRolloverStrategy max="1500"/>
+        </RollingFile>
+
+    </appenders>
+
+    <!--Logger节点用来单独指定日志的形式，比如要为指定包下的class指定不同的日志级别等。-->
+    <!--然后定义loggers，只有定义了logger并引入的appender，appender才会生效-->
+    <loggers>
+
+        <!--过滤掉spring和mybatis的一些无用的DEBUG信息-->
+        <logger name="org.mybatis" level="info" additivity="false">
+            <AppenderRef ref="Console"/>
+        </logger>
+        <!--监控系统信息-->
+        <!--若是additivity设为false，则 子Logger 只会在自己的appender里输出，而不会在 父Logger 的appender里输出。-->
+        <Logger name="org.springframework" level="info" additivity="false">
+            <AppenderRef ref="Console"/>
+        </Logger>
+
+        <root level="info">
+            <appender-ref ref="Console"/>
+            <appender-ref ref="Filelog"/>
+            <appender-ref ref="RollingFileInfo"/>
+            <appender-ref ref="RollingFileWarn"/>
+            <appender-ref ref="RollingFileError"/>
+        </root>
+    </loggers>
+
+</configuration>

src/main/resources/mapper/GraphicformMapper.xml

@@ -7,7 +7,7 @@
 
         SELECT * FROM graphicform WHERE 1 = 1
 
-			<if test="g_parent_sun =='2'">
+			<if test='g_parent_sun != "" and g_parent_sun!=null' >
 				AND g_parent_sun = #{g_parent_sun}
 			</if>
 			and g_parent = #{g_parent}
@@ -36,4 +36,72 @@
 			g_recommend ASC
     </select>
 
+
+	<select id="queryCarousel" resultType="Graphicform">
+
+		SELECT * FROM graphicform WHERE 1 = 1
+
+		<if test='g_parent_sun != "" and g_parent_sun!=null' >
+			AND g_parent_sun = #{g_parent_sun}
+		</if>
+		and g_parent = #{g_parent}
+		and g_thumbnail !=''
+		AND g_state = 2
+		AND (
+		( g_visit_strat = 1 )
+		OR ( g_visit_strat = 2 AND g_bf_id IN
+		<foreach collection="gBfIdList" item="gBfId" index="index" open="(" close=")" separator=",">
+			#{gBfId}
+		</foreach>
+		)
+		<if test="gWsIdList.size() >'0'">
+			OR ( g_visit_strat = 3 AND g_ws_id IN
+			<foreach collection="gWsIdList" item="gWsId" index="index" open="(" close=")" separator=",">
+				#{gWsId}
+			</foreach>
+			)
+		</if>
+		OR (
+		g_visit_strat = 4 AND FIND_IN_SET( #{key}, g_range )
+		)
+		)
+		ORDER BY
+		g_add_time DESC,
+		g_recommend ASC
+	</select>
+
+
+	<select id="queryCountByParam" resultType="int">
+
+		SELECT count(g_id) FROM graphicform WHERE 1 = 1
+
+		<if test='g_parent_sun != "" and g_parent_sun!=null' >
+			AND g_parent_sun = #{g_parent_sun}
+		</if>
+		and g_parent = #{g_parent}
+
+		AND g_state = 2
+		AND (
+		( g_visit_strat = 1 )
+		OR ( g_visit_strat = 2 AND g_bf_id IN
+		<foreach collection="gBfIdList" item="gBfId" index="index" open="(" close=")" separator=",">
+			#{gBfId}
+		</foreach>
+		)
+		<if test="gWsIdList.size() >'0'">
+			OR ( g_visit_strat = 3 AND g_ws_id IN
+			<foreach collection="gWsIdList" item="gWsId" index="index" open="(" close=")" separator=",">
+				#{gWsId}
+			</foreach>
+			)
+		</if>
+		OR (
+		g_visit_strat = 4 AND FIND_IN_SET( #{key}, g_range )
+		)
+		)
+		ORDER BY
+		g_add_time DESC,
+		g_recommend ASC
+	</select>
+
 </mapper>

src/main/resources/mapper/LowCodeTransferMapper.xml

@@ -0,0 +1,14 @@
+<?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.hxgk.zxxy.mapper.LowCodeTransferMapper">
+
+
+
+
+    <select id="getCarList" resultType="Car">
+
+      select * from car
+
+    </select>
+
+</mapper>

src/main/resources/mapper/UserMapper.xml

@@ -0,0 +1,18 @@
+<?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.hxgk.zxxy.mapper.UserMapper">
+
+
+    <select id="getManContByKey" resultType="ManCont">
+
+      select * from man_cont where id=#{key}
+
+    </select>
+
+    <select id="getManContListByAdminOrg" resultType="OrgAndManTree">
+
+      select number as id,admin_org as parentId,name as label from man_cont where admin_org=#{adminOrg}
+
+    </select>
+
+</mapper>

src/test/java/com/hxgk/zxxy/ZxxyApplicationTests.java

@@ -1,20 +0,0 @@
-package com.hxgk.zxxy;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-
-@SpringBootTest
-class ZxxyApplicationTests {
-@Autowired
-private StringRedisTemplate redisTemplate;
-	@Test
-	void contextLoads() {
-		//redisTemplate.getConnectionFactory().getConnection().select(5);
-		redisTemplate.opsForValue().set("name1","to1m");
-
-	}
-
-}