lrl-2012-11-1

src/main/java/com/steerinfo/ems/emscalpointvalue/service/impl/EmsCalpointValueServiceImpl.java

@@ -1,31 +1,25 @@
 package com.steerinfo.ems.emscalpointvalue.service.impl;
 
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.ems.emscalpointvalue.model.EmsCalpointValue;
 import com.steerinfo.auth.utils.JwtUtil;
 import com.steerinfo.ems.emscalpointvalue.mapper.EmsCalpointValueMapper;
+import com.steerinfo.ems.emscalpointvalue.model.EmsCalpointValue;
 import com.steerinfo.ems.emscalpointvalue.service.IEmsCalpointValueService;
 import com.steerinfo.ems.formula.service.IFormulaService;
 import com.steerinfo.ems.trmcalpoint.mapper.TRmCalpointMapper;
 import com.steerinfo.ems.trmcalpoint.model.TRmCalpoint;
-import com.steerinfo.ems.trmcalpoint.service.ITRmCalpointService;
 import com.steerinfo.ems.trmcalpointvalue.mapper.TRmCalpointValueMapper;
 import com.steerinfo.ems.trmcalpointvalue.model.TRmCalpointValue;
-
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * EmsCalpointValue服务实现：
@@ -104,7 +98,8 @@ public class EmsCalpointValueServiceImpl extends BaseServiceImpl<EmsCalpointValu
 			emsCalpointValueMapper.updateByPrimaryKeySelective(nx);
 		}
 		
-		if(c == null || c.getEnergytypeid().equalsIgnoreCase("W")) {
+		//if(c == null || c.getEnergytypeid().equalsIgnoreCase("W")) {
+		if(c == null) {
 			return;
 		}
 		
@@ -115,7 +110,7 @@ public class EmsCalpointValueServiceImpl extends BaseServiceImpl<EmsCalpointValu
 		if(t!=null && model.getApportvalue()!=null){
 			t.setApportvalue(model.getApportvalue());
 			t.setCorrectvalue(model.getApportvalue().subtract(t.getActualvalue()==null?BigDecimal.ZERO:t.getActualvalue()));
-			if(model.getBz()!=null){
+			if(model.getBz()!=null && model.getBz()!=""){
 				t.setBz(model.getBz());
 			}else{
 				t.setBz("人工录入，自动修改");

src/main/java/com/steerinfo/ems/emscordas/mapper/EmsCordasMapper.xml

@@ -9,6 +9,6 @@
       <if test="cordasDataNames != null and cordasDataNames != ''">
         , ${cordasDataNames}
       </if>
-    from EMS_JH1, EMS_JH2, EMS_1LT, EMS_2LT, EMS_1LG, EMS_2LG, EMS_1ZG, EMS_2ZG, EMS_FLCJ, EMS_WATER
+    from EMS_JH1, EMS_JH2, EMS_1LT, EMS_2LT, EMS_1LG, EMS_2LG, EMS_1ZG, EMS_2ZG, EMS_FLCJ, EMS_WATER, EMS_POWER
   </select>
 </mapper>

src/main/java/com/steerinfo/ems/trmcalpoint/mapper/TRmCalpointMapper.xml

@@ -1297,7 +1297,7 @@
     </select>
 
   <select id="getMaxId" parameterType="com.steerinfo.ems.trmcalpoint.model.TRmCalpoint" resultType="string">
-    SELECT MAX(SUBSTR(ITEMID, 10)) FROM T_RM_CALPOINT
+    SELECT MAX(SUBSTR(ITEMID, -4)) FROM T_RM_CALPOINT
     where ITEMID like '${head}%'
   </select>
   

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

@@ -2,14 +2,17 @@ package com.steerinfo.task;
 
 import com.steerinfo.ems.Utils.DateUtils;
 import com.steerinfo.ems.bfhyd.service.IBfhydService;
+import com.steerinfo.ems.dzmaterialsf.service.IDzMaterialSfService;
 import com.steerinfo.ems.emsetiming.service.IEmsETimingService;
 import com.steerinfo.ems.emsgmpcjh.service.IEmsGmPcJhService;
+import com.steerinfo.ems.emsscqklg.service.IEmsScqkLgService;
 import com.steerinfo.ems.emswaterrealtime.service.IEmsWaterRealtimeService;
 import com.steerinfo.ems.ifemsmesactitem.service.IIfEmsMesActitemService;
 import com.steerinfo.ems.ifmesemsproductorder.service.IIfMesEmsProductorderService;
 import com.steerinfo.ems.ifmesemsswapfile.service.IIfMesEmsSwapfileService;
 import com.steerinfo.ems.ifmesemswatermonitor.service.IIfMesEmsWatermonitorService;
 import com.steerinfo.ems.mesemsdieseloil.service.IMesEmsDieseloilService;
+import com.steerinfo.ems.rttable.service.IRttableService;
 import com.steerinfo.ems.tcm0312.controller.TCm0312Controller;
 import com.steerinfo.ems.tcm0318.service.ITCm0318Service;
 import com.steerinfo.ems.tcm0348.service.ITCm0348Service;
@@ -54,7 +57,7 @@ public class SpringCronTask implements SchedulingConfigurer{
 
 	private ScheduledTaskRegistrar taskRegistrar;
 
-	private Map<String, ScheduledFuture<?>> taskFutures = new ConcurrentHashMap<String, ScheduledFuture<?>>();
+	private Map<String, ScheduledFuture<?>>  taskFutures = new ConcurrentHashMap<String, ScheduledFuture<?>>();
 
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
@@ -108,6 +111,12 @@ public class SpringCronTask implements SchedulingConfigurer{
 	IEmsWaterRealtimeService emsWaterRealtimeService;
 	@Autowired
 	IEmsGmPcJhService emsGmPcJhService;
+	@Autowired
+	IDzMaterialSfService dzMaterialSfService;
+	@Autowired
+	IRttableService rttableService;
+	@Autowired
+	IEmsScqkLgService emsScqkLgService;
 	/**
 	 * SchedulingConfigurer接口的方法实现，加载后自动运行
 	 */

src/main/resources/bootstrap.yml

@@ -19,6 +19,14 @@ spring:
       trace:
         enabled: false
       enabled: false
+#feign的超时时间
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 5000
+        readTimeout: 10000
+        loggerLevel: full
 server:
   port: ${SERVER_PORT:8086}
   tomcat: