fix: 结构调整

.gitignore

+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### JRebel ###
+rebel.xml
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+*.swp
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml

pom.xml

@@ -109,7 +109,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <fork>true</fork>
-                    <mainClass>com.ruoyi.StartApplication</mainClass>
+                    <mainClass>com.ruoyi.Application</mainClass>
                     <includeSystemScope>true</includeSystemScope>
                 </configuration>
             </plugin>
@@ -128,7 +128,7 @@
                         <configuration>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>com.ruoyi.StartApplication</mainClass>
+                                    <mainClass>com.ruoyi.Application</mainClass>
                                     <!-- 主类的位置，例如上图文件，主类配置应为： -->
                                     <!-- <mainClass>top.nihilwater.App</mainClass> -->
                                 </transformer>

src/META-INF/MANIFEST.MF

-Manifest-Version: 1.0
-Main-Class: com.ruoyi.StartApplication
-

src/main/java/com/ruoyi/StartApplication.java → src/main/java/com/ruoyi/Application.java

@@ -8,11 +8,11 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableScheduling
 @SpringBootApplication
-@MapperScan("com.ruoyi.insertTProject.mapper")
-public class StartApplication {
+@MapperScan("com.ruoyi.job.mapper")
+public class Application {
 
     public static void main(String[] args) {
-        SpringApplication.run(StartApplication.class, args);
+        SpringApplication.run(Application.class, args);
     }
 
 }

src/main/java/com/ruoyi/insertTProject/mapper/dataInsertTProjectMapper.java

-package com.ruoyi.insertTProject.mapper;
-
-import com.ruoyi.insertTProject.domain.dataInsertTProjectDomain;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface dataInsertTProjectMapper {
-
-    public int addInfo(dataInsertTProjectDomain info);
-
-}

src/main/java/com/ruoyi/insertTProject/service/dataInsertTProjectService.java

-package com.ruoyi.insertTProject.service;
-
-import com.ruoyi.insertTProject.domain.dataInsertTProjectDomain;
-
-public interface dataInsertTProjectService {
-
-    public int addInfo(dataInsertTProjectDomain info);
-
-}

src/main/java/com/ruoyi/insertTProject/service/impl/dataInsertTProjectServiceImpl.java

-package com.ruoyi.insertTProject.service.impl;
-
-import com.ruoyi.insertTProject.domain.dataInsertTProjectDomain;
-import com.ruoyi.insertTProject.mapper.dataInsertTProjectMapper;
-import com.ruoyi.insertTProject.service.dataInsertTProjectService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class dataInsertTProjectServiceImpl implements dataInsertTProjectService {
-
-
-    @Autowired
-    dataInsertTProjectMapper getinfomapper;
-
-    @Override
-    public int addInfo(dataInsertTProjectDomain info) {
-
-        return getinfomapper.addInfo(info);
-    }
-}

src/main/java/com/ruoyi/insertTProject/domain/dataInsertTProjectDomain.java → src/main/java/com/ruoyi/job/domain/Project.java

-package com.ruoyi.insertTProject.domain;
+package com.ruoyi.job.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -7,7 +7,7 @@ import java.util.Date;
 
 @Data
 @TableName("t_project")
-public class dataInsertTProjectDomain {
+public class Project {
 
     private String id;
 

src/main/java/com/ruoyi/job/mapper/ProjectMapper.java

+package com.ruoyi.job.mapper;
+
+import com.ruoyi.job.domain.Project;
+
+public interface ProjectMapper {
+
+    public int addInfo(Project info);
+
+}

src/main/java/com/ruoyi/job/service/ProjectService.java

+package com.ruoyi.job.service;
+
+public interface ProjectService {
+
+}

src/main/java/com/ruoyi/insertTProject/service/impl/dataInsertTProject.java → src/main/java/com/ruoyi/job/service/impl/ProjectServiceImpl.java

-package com.ruoyi.insertTProject.service.impl;
-
+package com.ruoyi.job.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.ruoyi.insertTProject.domain.dataInsertTProjectDomain;
-import com.ruoyi.insertTProject.service.dataInsertTProjectService;
+import com.ruoyi.job.domain.Project;
+import com.ruoyi.job.mapper.ProjectMapper;
+import com.ruoyi.job.service.ProjectService;
 import com.sefonsoft.cloud.govern.service.invoke.ServiceSdk;
 import com.sefonsoft.cloud.govern.service.invoke.domain.DataQuery;
 import com.sefonsoft.cloud.govern.service.invoke.domain.DataServiceRequestDTO;
 import com.sefonsoft.cloud.govern.service.invoke.domain.ServiceRequestFieldDTO;
 import com.sefonsoft.cloud.govern.service.invoke.domain.SortDTO;
 import com.sefonsoft.cloud.govern.service.invoke.utils.Tools;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
 
-@Component("ServiceSdkT")
-public class dataInsertTProject {
+@Service
+@Slf4j
+public class ProjectServiceImpl implements ProjectService {
+
     @Autowired
-    dataInsertTProjectService infoService;
-    public static final Logger LOGGER = LoggerFactory.getLogger(dataInsertTProject.class);
+    ProjectMapper getinfomapper;
+
     private static String url = "https://2.19.247.137:18199/data-service/gateway/v2.0/data-service";
     private static String userId = "a_sunjiyuan05033655";
     private static String subServiceId = "1827987788174319616";
@@ -35,18 +37,13 @@ public class dataInsertTProject {
     private static String accessToken = "1827987788174319617";
     private static String nextToken = "";
 
-    public dataInsertTProject() {
-    }
-
-    @Scheduled(
-            cron = "0 0 1 * * ?"
-    )
+    @Scheduled(cron = "0 0 1 * * ?")
     public void getData() throws Exception {
         DataServiceRequestDTO req = null;
         int size = 1000;
         int currentSize = 1;
 
-        while(currentSize != 0) {
+        while (currentSize != 0) {
             if (Tools.isNull(nextToken)) {
                 List<ServiceRequestFieldDTO> mustFields = new ArrayList();
                 mustFields.add(new ServiceRequestFieldDTO("areaId", "c..", "eq", "1591285477854248961"));
@@ -63,38 +60,39 @@ public class dataInsertTProject {
             }
 
             String result = ServiceSdk.invoke(url, req, userId, subServiceId, applicationId, accessToken);
+            log.info("响应数据：{}", result);
             JSONObject JsonData = JSONUtil.parseObj(JSONUtil.parseObj(result).get("data").toString());
             nextToken = JsonData.get("next_token").toString();
             currentSize = JsonData.getInt("currentSize");
             JSONArray jsonArray = JsonData.getJSONArray("list");
 
-            for(int i = 0; i < jsonArray.size(); ++i) {
+            for (int i = 0; i < jsonArray.size(); ++i) {
                 JSONObject data = jsonArray.getJSONObject(i);
-                dataInsertTProjectDomain domain = new dataInsertTProjectDomain();
+                Project domain = new Project();
                 domain.setId(data.get("id").toString());
-                domain.setCreateDate((Date)data.get("createDate"));
+                domain.setCreateDate((Date) data.get("createDate"));
                 domain.setCreater(data.get("creater").toString());
-                domain.setUpdateDate((Date)data.get("updateDate"));
+                domain.setUpdateDate((Date) data.get("updateDate"));
                 domain.setUpdater(data.get("updater").toString());
-                domain.setDeleteDate((Date)data.get("deleteDate"));
+                domain.setDeleteDate((Date) data.get("deleteDate"));
                 domain.setDeleter(data.get("deleter").toString());
                 domain.setRemark(data.get("remark").toString());
-                domain.setSort((Integer)data.get("sort"));
+                domain.setSort((Integer) data.get("sort"));
                 domain.setSts(data.get("sts").toString());
                 domain.setAreaId(data.get("areaId").toString());
                 domain.setCompanyName(data.get("companyName").toString());
                 domain.setDescription(data.get("description").toString());
-                domain.setGreat((Integer)data.get("great"));
-                domain.setInvest((Integer)data.get("invest"));
+                domain.setGreat((Integer) data.get("great"));
+                domain.setInvest((Integer) data.get("invest"));
                 domain.setMapAddr(data.get("mapAddr").toString());
                 domain.setMode(data.get("mode").toString());
                 domain.setProjectAddr(data.get("projectAddr").toString());
                 domain.setProjectName(data.get("projectName").toString());
                 domain.setRecordCode(data.get("recordCode").toString());
-                domain.setRecordDate((Date)data.get("recordDate"));
+                domain.setRecordDate((Date) data.get("recordDate"));
                 domain.setStage(data.get("stage").toString());
-                int num = this.infoService.addInfo(domain);
-                LOGGER.info("本次导入{}条数据", num);
+                int num = getinfomapper.addInfo(domain);
+                log.info("本次导入{}条数据", num);
             }
         }
 

src/main/java/com/ruoyi/job/service/impl/dataInsertTProject.java

+package com.ruoyi.job.service.impl;
+
+
+import com.ruoyi.job.service.ProjectService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component("ServiceSdkT")
+public class dataInsertTProject {
+    @Autowired
+    ProjectService infoService;
+    public static final Logger LOGGER = LoggerFactory.getLogger(dataInsertTProject.class);
+
+}

src/main/resources/mapper.getInfo/dataInsertTProjectMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.ruoyi.insertTProject.mapper.dataInsertTProjectMapper">
 
 
-    <insert id="addInfo" parameterType="com.ruoyi.insertTProject.domain.dataInsertTProjectDomain">
+    <insert id="addInfo" parameterType="com.ruoyi.job.domain.Project">
         insert into t_project
         (id,create_date,creater,delete_date,deleter,update_date,updater,remark,sort,sts,area_id,company_name,description,great,invest,map_addr,mode,project_addr,project_name,record_code,record_date,stage)
         values (#{id},#{createDate},{creater},#{deleteDate},#{deleter},#{updateDate},#{updater},#{remark},#{sort},#{sts},#{areaId},#{companyName},#{description},#{great},#{invest},#{mapAddr},#{mode},#{projectAddr},#{projectName},#{recordCode},#{recordDate},#{stage})