Merge branch 'master' of https://git.steerinfo.com/XTEMS/xt-ems-api

src/main/java/com/steerinfo/ems/emswaihoursumtab1/model/EmsWAiHourSumTab1.java

@@ -1500,7 +1500,7 @@ public class EmsWAiHourSumTab1 implements IBasePO<String> {
     }
 
     public void setTag102(Double tag102) {
-        this.tag101 = tag102;
+        this.tag102 = tag102;
     }
 
     public Double getTag103() {
@@ -1508,7 +1508,7 @@ public class EmsWAiHourSumTab1 implements IBasePO<String> {
     }
 
     public void setTag103(Double tag103) {
-        this.tag101 = tag103;
+        this.tag103 = tag103;
     }
 
     public Double getTag104() {
@@ -1524,7 +1524,7 @@ public class EmsWAiHourSumTab1 implements IBasePO<String> {
     }
 
     public void setTag105(Double tag105) {
-        this.tag101 = tag105;
+        this.tag103 = tag105;
     }
 
     public Double getTag45() {

src/main/java/com/steerinfo/ems/rttable/mapper/RttableMapper.xml

@@ -286,6 +286,6 @@
     SELECT p.ALTID,p.RTVALUE,BTYPE2 AS NOTE
     FROM T_RM_CALPOINT c
     INNER JOIN RTTABLE p ON c.TAGID = p.ALTID
-    AND c.ENERGYTYPEID = 'P' AND c.ITEMTYPE='AUTO'
+    AND c.ENERGYTYPEID = 'P' AND c.ITEMTYPE='AUTO'  AND c.USEFLAG = '1' AND RTVALUE IS NOT NULL
   </select>
 </mapper>

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/controller/TRmWorkprocMaterialValueController.java

@@ -241,6 +241,7 @@ public class TRmWorkprocMaterialValueController extends BaseRESTfulController {
     		return failed(null, "请传入时间粒度");
     	}
 		//ifMesEmsSwapfileService.synchronousMesAnEmsData();
+        //这些数据有问题。暂时不动，不影响数据
 		tRmWorkprocMaterialValueService.synchronousData();
 		tRmWorkprocMaterialValueService.synchronousData4();
 		tRmWorkprocMaterialValueService.synchronousData5();

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/controller/TRmWorkprocProductValueController.java

@@ -4,7 +4,6 @@ import com.steerinfo.auth.utils.JwtUtil;
 import com.steerinfo.ems.Utils.DateUtils;
 import com.steerinfo.ems.formula.service.IFormulaService;
 import com.steerinfo.ems.ifmesemsswapfile.service.IIfMesEmsSwapfileService;
-import com.steerinfo.ems.trmworkprocmaterialvalue.model.TRmWorkprocMaterialValue;
 import com.steerinfo.ems.trmworkprocproduct.mapper.TRmWorkprocProductMapper;
 import com.steerinfo.ems.trmworkprocproduct.model.TRmWorkprocProduct;
 import com.steerinfo.ems.trmworkprocproduct.service.ITRmWorkprocProductService;
@@ -431,6 +430,7 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
     	}
 		parmas.put("useflag", "1");
 		//ifMesEmsSwapfileService.synchronousMesAnEmsData();
+        //这些方法有问题。暂时不动，不影响数据
 		tRmWorkprocProductValueService.synchronousData();
 		tRmWorkprocProductValueService.synchronousOrderData();
 		// 查询需要统计的项目
@@ -441,7 +441,7 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
 			res = formulaService.reItemVal(t.getItemid(),clock,timegranid,clocke);
 		}
         //根据报表中的产量数据生成
-        //tRmWorkprocProductValueService.getReportValue(parmas);
+        tRmWorkprocProductValueService.getReportValue(parmas);
         tRmWorkprocProductValueService.getReportProductValue(parmas);
 		if(!res.isEmpty()){
 			return failed(null, res);

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/mapper/TRmWorkprocProductValueMapper.xml

@@ -812,6 +812,8 @@ FROM
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RCL AS ACTUALVALUE,(100-W)/100*RCL AS APPORTVALUE,'AT2017CP040R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND RCL IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,JY_CL AS ACTUALVALUE,JY_CL AS APPORTVALUE,'AT2011CP032R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND JY_CL IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,CB_CL AS ACTUALVALUE,CB_CL AS APPORTVALUE,'AT2011CP026R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND CB_CL IS NOT NULL UNION ALL
+    SELECT TO_CHAR( DATES, 'yyyy-MM-dd' ) AS CLOCK,JMCL AS ACTUALVALUE,JMCL AS APPORTVALUE,'AT2012CP031R' AS ITEMID FROM EMS_SCQK_JJ WHERE
+ TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND JMCL IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,YS_CL AS ACTUALVALUE,YS_CL AS APPORTVALUE,'AT2009CP022R' AS ITEMID FROM EMS_SCQK_SJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND YS_CL IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,ES_CL AS ACTUALVALUE,ES_CL AS APPORTVALUE,'AT2010CP022R' AS ITEMID FROM EMS_SCQK_SJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND ES_CL IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RCL_1 AS ACTUALVALUE,RCL_1 AS APPORTVALUE,'AT3001CP053R' AS ITEMID FROM EMS_SCQK_GL WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND RCL_1 IS NOT NULL UNION ALL

src/main/java/com/steerinfo/ftp/uploadfile/mapper/UploadFileMapper.xml

@@ -62,7 +62,12 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
+      <if test="securityInfo != null and securityInfo != ''">
+        and (SECURITY_INFO is null
+        OR SECURITY_INFO = ''
+        OR REGEXP_LIKE(SECURITY_INFO,'(${securityInfo})'))
+      </if>
       <if test="id != null and id != ''">
         and ID LIKE '%${id}%'
       </if>
@@ -261,7 +266,8 @@
     <include refid="where"/>
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
+    <include refid="select_alias"/>
+    LEFT JOIN SECURITY_TYPE s ON s.ID = t.TYPE
     <include refid="whereLike"/>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">

src/main/java/com/steerinfo/ftp/uploadfile/utils/FtpFileUtil.java

@@ -138,9 +138,9 @@ public class FtpFileUtil {
         boolean result;
         try {
             //建立连接
-            connectToServer();
+            this.connectToServer();
             ftpClient.changeWorkingDirectory("/");
-            setFileType(FTP.BINARY_FILE_TYPE);
+            this.setFileType(FTP.BINARY_FILE_TYPE);
             int reply = ftpClient.getReplyCode();
             if (!FTPReply.isPositiveCompletion(reply)) {
                 ftpClient.disconnect();
@@ -195,9 +195,9 @@ public class FtpFileUtil {
         InputStream inputStream;
         String data = fileName + "预览失败";
         try {
-            connectToServer();
+            this.connectToServer();
             // 设置传输二进制文件
-            setFileType(FTP.BINARY_FILE_TYPE);
+            this.setFileType(FTP.BINARY_FILE_TYPE);
             ftpClient.enterLocalPassiveMode();
             int reply = ftpClient.getReplyCode();
             if(!FTPReply.isPositiveCompletion(reply)){
@@ -271,10 +271,10 @@ public class FtpFileUtil {
     public boolean download(HttpServletResponse response, String fileName, String filePath) {
         boolean flag = false;
         try{
-            connectToServer();
+            this.connectToServer();
             // 设置传输二进制文件
-            setFileType(FTP.BINARY_FILE_TYPE);
-            ftpClient.enterLocalPassiveMode();
+            this.setFileType(FTP.BINARY_FILE_TYPE);
+            this.ftpClient.enterLocalPassiveMode();
             int reply = ftpClient.getReplyCode();
             if(!FTPReply.isPositiveCompletion(reply)){
                 ftpClient.disconnect();
@@ -317,9 +317,9 @@ public class FtpFileUtil {
     public ByteArrayOutputStream download(String fileName, String filePath) {
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         try{
-            connectToServer();
+            this.connectToServer();
             // 设置传输二进制文件
-            setFileType(FTP.BINARY_FILE_TYPE);
+            this.setFileType(FTP.BINARY_FILE_TYPE);
             ftpClient.enterLocalPassiveMode();
             int reply = ftpClient.getReplyCode();
             if(!FTPReply.isPositiveCompletion(reply)){
@@ -350,9 +350,9 @@ public class FtpFileUtil {
         boolean result;
         try {
             //建立连接
-            connectToServer();
+            this.connectToServer();
             ftpClient.changeWorkingDirectory("/");
-            setFileType(FTP.BINARY_FILE_TYPE);
+            this.setFileType(FTP.BINARY_FILE_TYPE);
             int reply = ftpClient.getReplyCode();
             if (!FTPReply.isPositiveCompletion(reply)) {
                 ftpClient.disconnect();

src/main/java/com/steerinfo/task/SpringCronTask.java

@@ -257,10 +257,11 @@ public class SpringCronTask implements SchedulingConfigurer{
 					 //新的业务逻辑，从报表获取数据。
 					 DateFormat dateForm = new SimpleDateFormat("YYYY-MM-dd");
 					 Calendar calendar=Calendar.getInstance();
-					 calendar.set(Calendar.HOUR_OF_DAY,-24);
+					 calendar.set(Calendar.HOUR_OF_DAY,-24*7);
 					 HashMap<String,Object> hs =new HashMap<>(4);
 					 hs.put("clock",dateForm.format(calendar.getTime()));
-					 hs.put("clocke",  DateUtils.dateStr(new Date(),"YYYY-MM-dd"));
+					 calendar.set(Calendar.HOUR_OF_DAY,24*6);
+					 hs.put("clocke", dateForm.format(calendar.getTime()));
 					 tRmWorkprocProductValueService.getReportProductValue(hs);
 					 tRmWorkprocMaterialValueService.getMaterialValue(hs);
 					logger.info("定时任务"+taskId+"执行时长：" + (System.currentTimeMillis() - start)/1000 + "秒");