zoro пре 1 година
родитељ
комит
beb65d84b2
23 измењених фајлова са 77 додато и 652 уклоњено
  1. 8 0
      .idea/.gitignore
  2. 7 0
      .idea/encodings.xml
  3. 14 0
      .idea/misc.xml
  4. 6 0
      .idea/vcs.xml
  5. 16 16
      pom.xml
  6. 14 8
      src/main/java/com/ghjg/shoreline/Schedule/ShorelineSchedule.java
  7. 0 27
      src/main/java/com/ghjg/shoreline/dao/ShoreLineMangeFile.java
  8. 0 200
      src/main/java/com/ghjg/shoreline/dao/ShorelineManage.java
  9. 0 201
      src/main/java/com/ghjg/shoreline/dao/ShorelineManageHistory.java
  10. 0 11
      src/main/java/com/ghjg/shoreline/mapper/ShoreLineHistoryMapper.java
  11. 0 12
      src/main/java/com/ghjg/shoreline/mapper/ShoreLineManageFileMapper.java
  12. 0 12
      src/main/java/com/ghjg/shoreline/mapper/ShoreLineMapper.java
  13. 0 8
      src/main/java/com/ghjg/shoreline/service/ShoreLineHistoryService.java
  14. 0 10
      src/main/java/com/ghjg/shoreline/service/ShoreLineMangeFileService.java
  15. 0 9
      src/main/java/com/ghjg/shoreline/service/ShoreLineService.java
  16. 0 17
      src/main/java/com/ghjg/shoreline/service/impl/ShoreLineHistoryServiceImpl.java
  17. 0 16
      src/main/java/com/ghjg/shoreline/service/impl/ShoreLineMangeFileServiceImpl.java
  18. 0 77
      src/main/java/com/ghjg/shoreline/service/impl/ShoreLineServiceImpl.java
  19. 11 10
      src/main/resources/application.yaml
  20. 1 1
      src/main/resources/logback-spring.xml
  21. 0 4
      src/main/resources/mapper/ShoreLineHistoryMapper.xml
  22. 0 4
      src/main/resources/mapper/ShoreLineManageFileMapper.xml
  23. 0 9
      src/main/resources/mapper/ShoreLineMapper.xml

+ 8 - 0
.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

+ 7 - 0
.idea/encodings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>

+ 14 - 0
.idea/misc.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8(64)" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

+ 16 - 16
pom.xml

@@ -21,11 +21,11 @@
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.4.1</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-boot-starter</artifactId>-->
+<!--            <version>3.4.1</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>cn.hutool</groupId>
@@ -37,17 +37,17 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-freemarker</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <scope>runtime</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.oracle.database.jdbc</groupId>-->
+<!--            <artifactId>ojdbc8</artifactId>-->
+<!--            <scope>runtime</scope>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>cn.easyproject</groupId>
-            <artifactId>orai18n</artifactId>
-            <version>12.1.0.2.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.easyproject</groupId>-->
+<!--            <artifactId>orai18n</artifactId>-->
+<!--            <version>12.1.0.2.0</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -62,7 +62,7 @@
     </dependencies>
 
     <build>
-        <finalName>shorelineSchedule</finalName>
+        <finalName>pythonTest</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

+ 14 - 8
src/main/java/com/ghjg/shoreline/Schedule/ShorelineSchedule.java

@@ -1,7 +1,9 @@
 package com.ghjg.shoreline.Schedule;
 
-import com.ghjg.shoreline.service.ShoreLineService;
-import org.springframework.beans.factory.annotation.Autowired;
+
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONObject;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -9,11 +11,15 @@ import javax.annotation.PostConstruct;
 
 @Component
 public class ShorelineSchedule {
-    @Autowired
-    private ShoreLineService shoreLineService;
-    @Scheduled(cron = "0 0 1 * * ? ")
-    //@PostConstruct
-    public void shorelineUpdate(){
-        shoreLineService.updateAllThreeTable();
+    //@Scheduled(cron = "0 0 1 * * ? ")
+    @Scheduled(cron = "0 0 0 * * ? ")
+    public void shorelineUpdate() throws Exception {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("startDate","2023-01-01");
+        jsonObject.put("endDate","2023-11-20");
+        HttpResponse httpResponse = HttpUtil.createPost("http://127.0.0.1:7071/ghjg/shipRecognition/coverByDates").body(jsonObject.toString()).executeAsync();
+        if (httpResponse.isOk()){
+            throw new Exception();
+        }
     }
 }

+ 0 - 27
src/main/java/com/ghjg/shoreline/dao/ShoreLineMangeFile.java

@@ -1,27 +0,0 @@
-package com.ghjg.shoreline.dao;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@TableName("GHJG_CHANNEL.SHORELINE_MANAGE_FILE")
-public class ShoreLineMangeFile {
-    @TableId("ID")
-    private String id;
-    @TableField("FILE_TYPE")
-    private String fileType;
-    @TableField("FILE_NAME")
-    private String fileName;
-    @TableField("FILE_PATH")
-    private String filePath;
-    @TableField("IS_DELETE")
-    private Integer isDelete;
-    @TableField("CREATE_TIME")
-    private Date createTime;
-    @TableField("CO_ID")
-    private String coId;
-}

+ 0 - 200
src/main/java/com/ghjg/shoreline/dao/ShorelineManage.java

@@ -1,200 +0,0 @@
-package com.ghjg.shoreline.dao;
-
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @TableName SHORELINE_MANAGE
- */
-@Data
-@TableName("GHJG_CHANNEL.SHORELINE_MANAGE")
-public class ShorelineManage {
-
-    /**
-     *
-     */
-    @TableField("OBJECTID")
-    private Long objectid;
-    /**
-     *
-     */
-    @TableField("LINE_CODE")
-    private String lineCode;
-    /**
-     *
-     */
-    @TableField("EXEQUATUR_CODE")
-    private String exequaturCode;
-    /**
-     *
-     */
-    @TableField("LINE_APPROVE_TYPE")
-    private String lineApproveType;
-    /**
-     *
-     */
-    @TableField("CERTIFICATION_STATUS")
-    private String certificationStatus;
-    /**
-     *
-     */
-    @TableField("LINE_USER")
-    private String lineUser;
-    /**
-     *
-     */
-    @TableField("CONTACT_ADDRESS")
-    private String contactAddress;
-    /**
-     *
-     */
-    @TableField("LINE_LOCATION")
-    private String lineLocation;
-    /**
-     *
-     */
-    @TableField("APPROVED_LENGTH")
-    private BigDecimal approvedLength;
-    /**
-     *
-     */
-    @TableField("MTQYSH")
-    private String mtqysh;
-    /**
-     *
-     */
-    @TableField("MAIN_USE")
-    private String mainUse;
-    /**
-     *
-     */
-    @TableField("NEAR_UP_USER")
-    private String nearUpUser;
-    /**
-     *
-     */
-    @TableField("NEAR_DOWN_USER")
-    private String nearDownUser;
-    /**
-     *
-     */
-    @TableField("CARD_FILL_UNIT")
-    private String cardFillUnit;
-    /**
-     *
-     */
-    @TableField("AUTHORITY_ORZ")
-    private String authorityOrz;
-    /**
-     *
-     */
-    @TableField("ISSUE_DATE")
-    private Date issueDate;
-    /**
-     *
-     */
-    @TableField("EFFECTIVE_DATE")
-    private Date effectiveDate;
-    /**
-     *
-     */
-    @TableField("EFFECTIVE_YEAR")
-    private String effectiveYear;
-    /**
-     *
-     */
-    @TableField("BELONG_AREA")
-    private String belongArea;
-    /**
-     *
-     */
-    @TableField("BELONG_STATION")
-    private String belongStation;
-    /**
-     *
-     */
-    @TableField("MAJOR_WATER_AREA_FACILITY")
-    private String majorWaterAreaFacility;
-    /**
-     *
-     */
-    @TableField("CONTROL_A_X")
-    private String controlAX;
-    /**
-     *
-     */
-    @TableField("CONTROL_A_Y")
-    private String controlAY;
-    /**
-     *
-     */
-    @TableField("CONTROL_B_X")
-    private String controlBX;
-    /**
-     *
-     */
-    @TableField("CONTROL_B_Y")
-    private String controlBY;
-    /**
-     *
-     */
-    @TableField("EXPLAIN")
-    private String explain;
-    /**
-     *
-     */
-    @TableField("LONGITUDE")
-    private String longitude;
-    /**
-     *
-     */
-    @TableField("LATITUDE")
-    private String latitude;
-    /**
-     *
-     */
-    @TableField("REMARK")
-    private String remark;
-    /**
-     *
-     */
-    @TableField("BELONG_COUNTRY")
-    private String belongCountry;
-    /**
-     *
-     */
-    @TableField("UPDATE_STATUS")
-    private String updateStatus;
-    /**
-     *
-     */
-    @TableField("LOCATION")
-    private String location;
-    /**
-     *
-     */
-    @TableField("LINE_TYPE")
-    private String lineType;
-
-    @TableField("FBDATE")
-    private Date fbDate;
-    @TableField("SAVE_DATE")
-    private Date saveDate;
-    @TableField("IS_SUBMIT")
-    private Integer isSubmit;
-    @TableField("IS_UPDATE")
-    private Integer isUpdate;
-
-    @TableField("UPDATE_USER")
-    private String updateUser;
-    @TableField("ID")
-    private String id;
-    @TableId("CODE")
-    private String code;
-}

+ 0 - 201
src/main/java/com/ghjg/shoreline/dao/ShorelineManageHistory.java

@@ -1,201 +0,0 @@
-package com.ghjg.shoreline.dao;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
-* 
-* @TableName SHORELINE_MANAGE
-*/
-@Data
-@TableName("GHJG_CHANNEL.SHORELINE_MANAGE_HISTORY")
-public class ShorelineManageHistory {
-
-    @TableId("KEYID")
-    private String keyId;
-    @TableField("ID")
-    private String id;
-    /**
-    * 
-    */
-    @TableField("OBJECTID")
-    private Long objectid;
-    /**
-    * 
-    */
-    @TableField("LINE_CODE")
-    private String lineCode;
-    /**
-    * 
-    */
-    @TableField("EXEQUATUR_CODE")
-    private String exequaturCode;
-    /**
-    * 
-    */
-    @TableField("LINE_APPROVE_TYPE")
-    private String lineApproveType;
-    /**
-    * 
-    */
-    @TableField("CERTIFICATION_STATUS")
-    private String certificationStatus;
-    /**
-    * 
-    */
-    @TableField("LINE_USER")
-    private String lineUser;
-    /**
-    * 
-    */
-    @TableField("CONTACT_ADDRESS")
-    private String contactAddress;
-    /**
-    * 
-    */
-    @TableField("LINE_LOCATION")
-    private String lineLocation;
-    /**
-    * 
-    */
-    @TableField("APPROVED_LENGTH")
-    private BigDecimal approvedLength;
-    /**
-    * 
-    */
-    @TableField("MTQYSH")
-    private String mtqysh;
-    /**
-    * 
-    */
-    @TableField("MAIN_USE")
-    private String mainUse;
-    /**
-    * 
-    */
-    @TableField("NEAR_UP_USER")
-    private String nearUpUser;
-    /**
-    * 
-    */
-    @TableField("NEAR_DOWN_USER")
-    private String nearDownUser;
-    /**
-    * 
-    */
-    @TableField("CARD_FILL_UNIT")
-    private String cardFillUnit;
-    /**
-    * 
-    */
-    @TableField("AUTHORITY_ORZ")
-    private String authorityOrz;
-    /**
-    * 
-    */
-    @TableField("ISSUE_DATE")
-    private Date issueDate;
-    /**
-    * 
-    */
-    @TableField("EFFECTIVE_DATE")
-    private Date effectiveDate;
-    /**
-    * 
-    */
-    @TableField("EFFECTIVE_YEAR")
-    private String effectiveYear;
-    /**
-    * 
-    */
-    @TableField("BELONG_AREA")
-    private String belongArea;
-    /**
-    * 
-    */
-    @TableField("BELONG_STATION")
-    private String belongStation;
-    /**
-    * 
-    */
-    @TableField("MAJOR_WATER_AREA_FACILITY")
-    private String majorWaterAreaFacility;
-    /**
-    * 
-    */
-    @TableField("CONTROL_A_X")
-    private String controlAX;
-    /**
-    *
-    */
-    @TableField("CONTROL_A_Y")
-    private String controlAY;
-    /**
-    * 
-    */
-    @TableField("CONTROL_B_X")
-    private String controlBX;
-    /**
-    * 
-    */
-    @TableField("CONTROL_B_Y")
-    private String controlBY;
-    /**
-    * 
-    */
-    @TableField("EXPLAIN")
-    private String explain;
-    /**
-    * 
-    */
-    @TableField("LONGITUDE")
-    private String longitude;
-    /**
-    * 
-    */
-    @TableField("LATITUDE")
-    private String latitude;
-    /**
-    * 
-    */
-    @TableField("REMARK")
-    private String remark;
-    /**
-    * 
-    */
-    @TableField("BELONG_COUNTRY")
-    private String belongCountry;
-    /**
-    * 
-    */
-    @TableField("UPDATE_STATUS")
-    private String updateStatus;
-    /**
-    * 
-    */
-    @TableField("LOCATION")
-    private String location;
-    /**
-    * 
-    */
-    @TableField("LINE_TYPE")
-    private String lineType;
-
-    @TableField("FBDATE")
-    private Date fbDate;
-    @TableField("SAVE_DATE")
-    private Date saveDate;
-    @TableField("IS_SUBMIT")
-    private Integer isSubmit;
-    @TableField("UPDATE_USER")
-    private String updateUser;
-    @TableField("IS_UPDATE")
-    private Integer isUpdate;
-    @TableField("CODE")
-    private String code;
-}

+ 0 - 11
src/main/java/com/ghjg/shoreline/mapper/ShoreLineHistoryMapper.java

@@ -1,11 +0,0 @@
-package com.ghjg.shoreline.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ghjg.shoreline.dao.ShorelineManageHistory;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface ShoreLineHistoryMapper extends BaseMapper<ShorelineManageHistory> {
-}

+ 0 - 12
src/main/java/com/ghjg/shoreline/mapper/ShoreLineManageFileMapper.java

@@ -1,12 +0,0 @@
-package com.ghjg.shoreline.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ghjg.shoreline.dao.ShoreLineMangeFile;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface ShoreLineManageFileMapper extends BaseMapper<ShoreLineMangeFile> {
-}

+ 0 - 12
src/main/java/com/ghjg/shoreline/mapper/ShoreLineMapper.java

@@ -1,12 +0,0 @@
-package com.ghjg.shoreline.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ghjg.shoreline.dao.ShorelineManage;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface ShoreLineMapper extends BaseMapper<ShorelineManage> {
-    List<ShorelineManage> getPassDateList();
-}

+ 0 - 8
src/main/java/com/ghjg/shoreline/service/ShoreLineHistoryService.java

@@ -1,8 +0,0 @@
-package com.ghjg.shoreline.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ghjg.shoreline.dao.ShorelineManageHistory;
-
-
-public interface ShoreLineHistoryService extends IService<ShorelineManageHistory> {
-}

+ 0 - 10
src/main/java/com/ghjg/shoreline/service/ShoreLineMangeFileService.java

@@ -1,10 +0,0 @@
-package com.ghjg.shoreline.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ghjg.shoreline.dao.ShoreLineMangeFile;
-
-
-import java.util.List;
-
-public interface ShoreLineMangeFileService extends IService<ShoreLineMangeFile> {
-}

+ 0 - 9
src/main/java/com/ghjg/shoreline/service/ShoreLineService.java

@@ -1,9 +0,0 @@
-package com.ghjg.shoreline.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ghjg.shoreline.dao.ShorelineManage;
-
-public interface ShoreLineService extends IService<ShorelineManage> {
-    void updateAllThreeTable();
-
-}

+ 0 - 17
src/main/java/com/ghjg/shoreline/service/impl/ShoreLineHistoryServiceImpl.java

@@ -1,17 +0,0 @@
-package com.ghjg.shoreline.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ghjg.shoreline.dao.ShorelineManageHistory;
-import com.ghjg.shoreline.mapper.ShoreLineHistoryMapper;
-import com.ghjg.shoreline.service.ShoreLineHistoryService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Service
-public class ShoreLineHistoryServiceImpl extends ServiceImpl<ShoreLineHistoryMapper, ShorelineManageHistory> implements ShoreLineHistoryService {
-    @Resource
-    private ShoreLineHistoryMapper shoreLineHistoryMapper;
-}

+ 0 - 16
src/main/java/com/ghjg/shoreline/service/impl/ShoreLineMangeFileServiceImpl.java

@@ -1,16 +0,0 @@
-package com.ghjg.shoreline.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ghjg.shoreline.dao.ShoreLineMangeFile;
-import com.ghjg.shoreline.mapper.ShoreLineManageFileMapper;
-import com.ghjg.shoreline.service.ShoreLineMangeFileService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Service
-public class ShoreLineMangeFileServiceImpl extends ServiceImpl<ShoreLineManageFileMapper, ShoreLineMangeFile> implements ShoreLineMangeFileService {
-    @Resource
-    private ShoreLineManageFileMapper shoreLineManageFileMapper;
-}

+ 0 - 77
src/main/java/com/ghjg/shoreline/service/impl/ShoreLineServiceImpl.java

@@ -1,77 +0,0 @@
-package com.ghjg.shoreline.service.impl;
-
-
-import cn.hutool.core.lang.generator.SnowflakeGenerator;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ghjg.shoreline.dao.ShoreLineMangeFile;
-import com.ghjg.shoreline.dao.ShorelineManage;
-import com.ghjg.shoreline.dao.ShorelineManageHistory;
-import com.ghjg.shoreline.mapper.ShoreLineMapper;
-import com.ghjg.shoreline.service.ShoreLineHistoryService;
-import com.ghjg.shoreline.service.ShoreLineService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ghjg.shoreline.service.ShoreLineMangeFileService;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-@Service
-@Slf4j
-public class ShoreLineServiceImpl extends ServiceImpl<ShoreLineMapper, ShorelineManage> implements ShoreLineService {
-    @Resource
-    private ShoreLineMapper shoreLineMapper;
-    @Autowired
-    private ShoreLineHistoryService shoreLineHistoryService;
-    @Autowired
-    private ShoreLineMangeFileService fileService;
-
-    @Override
-    public void updateAllThreeTable() {
-        List<ShorelineManage> passDateList = shoreLineMapper.getPassDateList();
-        if (passDateList.isEmpty()) {
-            log.info("无需要更新的内容");
-        } else {
-            ArrayList<ShorelineManageHistory> shorelineManageHistories = new ArrayList<>();
-            ArrayList<ShoreLineMangeFile> shoreLineMangeFiles = new ArrayList<>();
-            for (ShorelineManage shorelineManage : passDateList) {
-                String lastId = shorelineManage.getId();
-                //先留存历史数据
-                ShorelineManageHistory shorelineManageHistory = new ShorelineManageHistory();
-                BeanUtils.copyProperties(shorelineManage, shorelineManageHistory);
-                shorelineManage.setUpdateUser("5043");
-                shorelineManageHistory.setKeyId(UUID.randomUUID().toString().replace("-",""));
-                shorelineManageHistories.add(shorelineManageHistory);
-
-                //更新现有数据
-                shorelineManage.setIsUpdate(1);
-                shorelineManage.setCertificationStatus("已过期");
-                shorelineManage.setUpdateUser("5043");
-                shorelineManage.setId(UUID.randomUUID().toString().replace("-",""));
-
-                //文件
-                List<ShoreLineMangeFile> files = fileService.list(Wrappers.<ShoreLineMangeFile>lambdaQuery().eq(ShoreLineMangeFile::getCoId, lastId));
-                if (!files.isEmpty()){
-                    //文件不空
-                    for (ShoreLineMangeFile file : files) {
-                        ShoreLineMangeFile shoreLineMangeFile = new ShoreLineMangeFile();
-                        BeanUtils.copyProperties(file,shoreLineMangeFile);
-                        shoreLineMangeFile.setCoId(shorelineManage.getId());
-                        shoreLineMangeFile.setId(new SnowflakeGenerator().next().toString());
-                        shoreLineMangeFiles.add(shoreLineMangeFile);
-                    }
-                }
-            }
-            this.updateBatchById(passDateList);
-            shoreLineHistoryService.saveBatch(shorelineManageHistories);
-            fileService.saveBatch(shoreLineMangeFiles);
-        }
-    }
-}

+ 11 - 10
src/main/resources/application.yaml

@@ -1,14 +1,15 @@
 server:
-  port: 7070
+  port: 7072
+#spring:
+#  datasource:
+#    driver-class-name: oracle.jdbc.driver.OracleDriver
+#    hikari:
+#      idle-timeout: 30000
+#      maximum-pool-size: 150
+#    password: GHJG@123
+#    url: jdbc:oracle:thin:@//172.17.190.5/orcl
+##    url: jdbc:oracle:thin:@//10.114.4.56/shhwdb
+#    username: ghjg_basics
 spring:
-  datasource:
-    driver-class-name: oracle.jdbc.driver.OracleDriver
-    hikari:
-      idle-timeout: 30000
-      maximum-pool-size: 150
-    password: GHJG@123
-    url: jdbc:oracle:thin:@//172.17.190.5/orcl
-#    url: jdbc:oracle:thin:@//10.114.4.56/shhwdb
-    username: ghjg_basics
   freemarker:
     check-template-location: false

+ 1 - 1
src/main/resources/logback-spring.xml

@@ -8,7 +8,7 @@
     <contextName>logback</contextName>
 
     <!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后,可以使“${}”来使用变量。 -->
-    <property name="log.path" value="./shoreline" />
+    <property name="log.path" value="./LOG" />
 
     <!--0. 日志格式和颜色渲染 -->
     <!-- 彩色日志依赖的渲染类 -->

+ 0 - 4
src/main/resources/mapper/ShoreLineHistoryMapper.xml

@@ -1,4 +0,0 @@
-<?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.ghjg.shoreline.mapper.ShoreLineHistoryMapper">
-</mapper>

+ 0 - 4
src/main/resources/mapper/ShoreLineManageFileMapper.xml

@@ -1,4 +0,0 @@
-<?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.ghjg.shoreline.mapper.ShoreLineManageFileMapper">
-</mapper>

+ 0 - 9
src/main/resources/mapper/ShoreLineMapper.xml

@@ -1,9 +0,0 @@
-<?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.ghjg.shoreline.mapper.ShoreLineMapper">
-    <select id="getPassDateList" resultType="com.ghjg.shoreline.dao.ShorelineManage">
-        select * from ghjg_channel.shoreline_manage
-        where EFFECTIVE_DATE &lt;= sysdate
-        and (certification_status = '已发证' or certification_status = '批文')
-    </select>
-</mapper>