Merge remote-tracking branch 'origin/master'

in-passback/pom.xml

@@ -85,6 +85,7 @@
                                 <directory>src/main/resources</directory>
                                 <includes>
                                     <include>application.properties</include>
+                                    <include>template/**</include>
                                 </includes>
                             </resource>
                         </resources>

in-passback/src/main/java/com/jiayue/passback/entity/UploadFileLog.java

@@ -31,10 +31,10 @@ public class UploadFileLog extends AbstractBaseEntity {
     private Integer id;
 
     /**
-     * 上报对象主键ID
+     * 上报对象编号
      */
-    @TableField("C_UPLOAD_OBJECT_ID")
-    private Integer uploadObjectId;
+    @TableField("C_UPLOAD_OBJECT_NO")
+    private String uploadObjectNo;
 
     /**
      * 文件名称
@@ -46,13 +46,13 @@ public class UploadFileLog extends AbstractBaseEntity {
      * 文件类型
      */
     @TableField("C_FILE_TYPE_ENUM")
-    private FileTypeEnum fileTypeEnum;
+    private String fileTypeEnum;
 
     /**
      * 文件状态
      */
     @TableField("C_FILE_STATUS_ENUM")
-    private FileStatusEnum fileStatusEnum;
+    private String fileStatusEnum;
 
     /**
      * 文件状态

in-passback/src/main/java/com/jiayue/passback/service/impl/UploadFileLogServiceImpl.java

@@ -12,13 +12,14 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
 @Slf4j
 public class UploadFileLogServiceImpl extends ServiceImpl<UploadFileLogMapper, UploadFileLog> implements UploadFileLogService {
-    @Value("${tunnelName}")
-    private String tunnelName;
+    @Value("${tunnelNo}")
+    private String tunnelNo;
 
     @Value("${dqType}")
     private String dqType;
@@ -26,29 +27,39 @@ public class UploadFileLogServiceImpl extends ServiceImpl<UploadFileLogMapper, U
     @Value("${cdqType}")
     private String cdqType;
 
+    @Value("${cdqUpMin}")
+    private int cdqUpMin;
+
     @Override
     public Map<String, Object> GenerateData(Date date) {
 
-        Date startTime = date;
+        Date cdqStartTime = new Date(date.getTime() - cdqUpMin  * 60 * 1000);
+
+        Date cdqEndTime = new Date(date.getTime() + 15 * 60 * 1000);
 
-        Date endTime = new Date(date.getTime() + 15 * 60 * 1000);
+        Date dqStartTime = new Date(date.getTime() - 15 * 60 * 1000);
 
+        Date dqEndTime = new Date(date.getTime() + 15 * 60 * 1000);
         Map<String, Object> map = new HashMap<>();
 
 
         if (list(lambdaQuery()
-                .between(UploadFileLog::getCreatTime, startTime, endTime)
+                .between(UploadFileLog::getCreatTime, cdqStartTime, cdqEndTime)
                 .eq(UploadFileLog::getFileTypeEnum, cdqType)
-                .eq(UploadFileLog::getFileStatusEnum, FileStatusEnum.E2).getWrapper()).size() > 0) {
+                .eq(UploadFileLog::getFileStatusEnum, FileStatusEnum.E2.name())
+                .eq(UploadFileLog::getUploadObjectNo, tunnelNo)
+                .getWrapper()).size() > 0) {
             map.put("cdqStatus", 1);
         }else {
             map.put("cdqStatus", 0);
         }
 
         if (list(lambdaQuery()
-                .between(UploadFileLog::getCreatTime, startTime, endTime)
+                .between(UploadFileLog::getCreatTime, dqStartTime, dqEndTime)
                 .eq(UploadFileLog::getFileTypeEnum, dqType)
-                .eq(UploadFileLog::getFileStatusEnum, FileStatusEnum.E2).getWrapper()).size() > 0) {
+                .eq(UploadFileLog::getUploadObjectNo, tunnelNo)
+                .eq(UploadFileLog::getFileStatusEnum, "E2")
+                .getWrapper()).size() > 0) {
             map.put("dqStatus", 1);
         }else {
             map.put("dqStatus", 0);

in-passback/src/main/java/com/jiayue/passback/util/FreemarkerUtil.java

@@ -4,9 +4,8 @@ import freemarker.template.Configuration;
 import freemarker.template.Template;
 import org.springframework.util.ResourceUtils;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
+import java.io.*;
+import java.net.URLDecoder;
 
 
 public class FreemarkerUtil {
@@ -15,7 +14,7 @@ public class FreemarkerUtil {
        //1.创建freemarker的配置对象
        Configuration configuration = new Configuration(Configuration.getVersion());
        //2.设置模板文件所在目录
-       String templateFilePath = ResourceUtils.getURL("classpath:").getPath() +File.separator+ "template";
+       String templateFilePath = getResourceBasePath() +File.separator+ "template";
 
        configuration.setDirectoryForTemplateLoading(new File(templateFilePath));
        //3.设置字符集
@@ -36,4 +35,36 @@ public class FreemarkerUtil {
        out.close();
    }
 
+
+
+    /**
+     * 获取项目根路径
+     *
+     * @return
+     */
+    public static String getResourceBasePath() {
+        // 获取跟目录
+        File path = null;
+        try {
+            path = new File(ResourceUtils.getURL("classpath:").getPath());
+
+        } catch (FileNotFoundException e) {
+            // nothing to do
+        }
+        if (path == null || !path.exists()) {
+            path = new File("");
+        }
+
+        String pathStr = path.getAbsolutePath();
+        try {
+            pathStr = URLDecoder.decode(pathStr, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        // 如果是在eclipse中运行，则和target同级目录,如果是jar部署到服务器，则默认和jar包同级
+//    pathStr = pathStr.replace("\\target\\classes", "");
+
+        return pathStr;
+    }
+
 }

in-passback/src/main/resources/application.properties

@@ -1,7 +1,8 @@
 job.cdqjob = 0 5,20,35,50 * * * ?
 #job.cdqjob = 0 0/1 * * * ?
 zxgl.path = \\\\YH\\backFile
-tunnelName = ¸ÊËàÉϱ¨
+#ͨµÀ¶ÔÏó±àºÅ
+tunnelNo = 1
 dqType = E1
 cdqType = E2
 cdqUpMin = 0
@@ -9,7 +10,7 @@ cdqUpMin = 0
 server.port = 9008
 
 spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://192.168.1.77:3306/ipfcst-v3?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://192.168.10.226:3307/ipfcst-v3?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
 spring.datasource.username = root
 spring.datasource.password = !QAZ2root
 

in-passback/src/main/resources/logback.xml

@@ -49,7 +49,7 @@
     <!-- 按照时间来 -->
     <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
       <!--日志文件输出的文件名-->
-      <FileNamePattern>${logbase}/%d{yyyy-MM-dd}/inin.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+      <FileNamePattern>${logbase}/%d{yyyy-MM-dd}/passback.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
       <!--日志文件保留天数-->
       <MaxHistory>180</MaxHistory>
       <maxFileSize>10MB</maxFileSize>