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

src/main/java/com/steerinfo/ems/Utils/CompareUtil.java

@@ -0,0 +1,98 @@
+package com.steerinfo.ems.Utils;
+
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.sql.Timestamp;
+import java.util.*;
+
+/**
+ * @author Shadow
+ * @create 2021-11-08 10:52
+ * @project xt-ems-api-new
+ */
+public class CompareUtil {
+    /**
+     * 比较两个实体属性值，返回一个boolean,true则表时两个对象中的属性值无差异
+     *
+     * @param oldObject 进行属性比较的对象1
+     * @param newObject 进行属性比较的对象2
+     * @return 属性差异比较结果boolean
+     */
+    public static boolean compareObject(Object oldObject, Object newObject) {
+        Map<String, List<Object>> resultMap = compareFields(oldObject, newObject, null);
+        if (resultMap.size() > 0) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * 比较两个实体属性值，返回一个map以有差异的属性名为key，value为一个Map分别存oldObject,newObject此属性名的值
+     *
+     * @param obj1      进行属性比较的对象1
+     * @param obj2      进行属性比较的对象2
+     * @param ignoreArr 忽略比较的字段
+     * @return 属性差异比较结果map
+     */
+    @SuppressWarnings("rawtypes")
+    public static Map<String, List<Object>> compareFields(Object obj1, Object obj2, String[] ignoreArr) {
+        try {
+            Map<String, List<Object>> map = new HashMap<String, List<Object>>();
+            List<String> ignoreList = null;
+            if (ignoreArr != null && ignoreArr.length > 0) {
+                // array转化为list
+                ignoreList = Arrays.asList(ignoreArr);
+            }
+            // 只有两个对象都是同一类型的才有可比性
+            if (obj1.getClass() == obj2.getClass()) {
+                Class clazz = obj1.getClass();
+                // 获取object的属性描述
+                PropertyDescriptor[] pds = Introspector.getBeanInfo(clazz,
+                        Object.class).getPropertyDescriptors();
+                // 这里就是所有的属性了
+                for (PropertyDescriptor pd : pds) {
+                    // 属性名
+                    String name = pd.getName();
+                    // 如果当前属性选择忽略比较，跳到下一次循环
+                    if (ignoreList != null && ignoreList.contains(name)) {
+                        continue;
+                    }
+                    // get方法
+                    Method readMethod = pd.getReadMethod();
+                    // 在obj1上调用get方法等同于获得obj1的属性值
+                    Object o1 = readMethod.invoke(obj1);
+                    // 在obj2上调用get方法等同于获得obj2的属性值
+                    Object o2 = readMethod.invoke(obj2);
+                    if (o1 instanceof Timestamp) {
+                        o1 = new Date(((Timestamp) o1).getTime());
+                    }
+                    if (o2 instanceof Timestamp) {
+                        o2 = new Date(((Timestamp) o2).getTime());
+                    }
+                    if (o1 == null && o2 == null) {
+                        continue;
+                    } else if (o1 == null && o2 != null) {
+                        List<Object> list = new ArrayList<Object>();
+                        list.add(o1);
+                        list.add(o2);
+                        map.put(name, list);
+                        continue;
+                    }
+                    // 比较这两个值是否相等,不等就可以放入map了
+                    if (!o1.equals(o2)) {
+                        List<Object> list = new ArrayList<Object>();
+                        list.add(o1);
+                        list.add(o2);
+                        map.put(name, list);
+                    }
+                }
+            }
+            return map;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

src/main/java/com/steerinfo/ems/Utils/MosaicUtils.java

@@ -14,10 +14,16 @@ import java.rmi.RemoteException;
 public class MosaicUtils {
     private static final Logger logger = LoggerFactory.getLogger(MosaicUtils.class);
 
-    static MswebserviceStub.UserInfo userInfo = new MswebserviceStub.UserInfo();
+    static MswebserviceStub.UserInfo userInfo =new MswebserviceStub.UserInfo();
+    static MswebserviceStub.WSQueryExecute query = new MswebserviceStub.WSQueryExecute();
+    static MswebserviceStub stub;
 
-    public static void SetOpenConnSample(MswebserviceStub stub) {
+    /**
+     * 打开mosaic连接
+     */
+    public static void SetOpenConnSample() {
         try {
+            stub = new MswebserviceStub("http://172.16.90.229:9900");
             userInfo = new MswebserviceStub.UserInfo();
             userInfo.setMdbName("scada");
             userInfo.setMdbInstance("master");
@@ -44,18 +50,17 @@ public class MosaicUtils {
 
     }
 
-    // 更新点的值
-    public static void SetUpdateValue(MswebserviceStub stub, String sql) {
+    /**
+     *    更新点的值
+     * @param sql sql语句
+     */
+    public static void SetUpdateValue(String sql) {
         // 0x0002:5365:2e
         MswebserviceStub.DataResult queryData = new MswebserviceStub.DataResult();
-
         try {
-
             //String sql = "update Ana set(Eng,User)=(100,0x0002:5365:2e) where AltId='PUMP1_SPEED' ";
             // Dig表为 update Dig set(Cs,User)=(1,0x0002:5365:2e) update Ana set Eng='1812482' where Equip='0x06f4:0bfe:1e' AND Quantity='0x006a:489c:22'
-
             userInfo.setComText(sql);
-            MswebserviceStub.WSQueryExecute query = new MswebserviceStub.WSQueryExecute();
             query.setUserInfo(userInfo);
             queryData = stub.wSQueryExecute(query);
             //logger.info(queryData.getData());
@@ -66,8 +71,10 @@ public class MosaicUtils {
         }
     }
 
-    // 关闭mosaic链接
-    public static void SetCloseConnSample(MswebserviceStub stub) {
+    /**
+     *    关闭mosaic链接
+     */
+    public static void SetCloseConnSample() {
         MswebserviceStub.WSConnectClose closeReq = new MswebserviceStub.WSConnectClose();
         closeReq.setUserInfo(userInfo);
         try {

src/main/java/com/steerinfo/ems/emscordas/controller/EmsCordasController.java

@@ -6,7 +6,6 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -38,7 +37,7 @@ public class EmsCordasController extends BaseRESTfulController {
     @ApiOperation(value="获取cordas的实时数据", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("trmactvalue:view")
-    @PostMapping(value = "/gettabledata")
+    @RequestMapping(value = "/gettabledata", produces  = "application/json;charset=UTF-8")
     public RESTfulResult gettabledata(@RequestBody Map<String, Object> model){
     	HashMap<String, Object> m = new HashMap<String, Object>();
     	m.put("cordasDataNames", model.get("cordasDataNames"));

src/main/java/com/steerinfo/ems/emsscqklg/model/LgReal.java

@@ -33,7 +33,7 @@ public class LgReal {
         }
 
         public String getEng() {
-                return eng;
+                return eng.trim();
         }
 
         public void setEng(String eng) {

src/main/java/com/steerinfo/ems/emsscqklg/service/EmsLgReportService.java

@@ -27,6 +27,9 @@ public interface EmsLgReportService {
     @GetMapping("v1/lgreport/queryReportByTime")
     public List<EmsScqkLg> queryReportByTime();
 
-    @GetMapping("v1/lgReal/queryReals")
-    public List<LgReal> queryReals();
+    @GetMapping("v1/lgReal/queryReals1")
+    public List<LgReal> queryReals1();
+
+    @GetMapping("v1/lgReal/queryReals2")
+    public List<LgReal> queryReals2();
 }

src/main/java/com/steerinfo/ems/emsscqklg/service/ILgRealService.java

@@ -10,6 +10,11 @@ public interface ILgRealService {
     /**
      *     获取炼钢实时数据
      */
-    public List<LgReal> QueryLgReals() throws AxisFault;
+    public List<LgReal> QueryLgReals1() throws AxisFault;
+
+    /**
+     *     获取炼钢实时数据
+     */
+    public List<LgReal> QueryLgReals2() throws AxisFault;
 
 }

src/main/java/com/steerinfo/ems/emsscqklg/service/impl/EmsScqkLgServiceImpl.java

@@ -1,5 +1,6 @@
 package com.steerinfo.ems.emsscqklg.service.impl;
 
+import com.steerinfo.ems.Utils.CompareUtil;
 import com.steerinfo.ems.emsscqklg.mapper.EmsScqkLgMapper;
 import com.steerinfo.ems.emsscqklg.model.EmsScqkLg;
 import com.steerinfo.ems.emsscqklg.service.EmsLgReportService;
@@ -11,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * EmsScqkLg服务实现：
@@ -44,6 +46,7 @@ public class EmsScqkLgServiceImpl extends BaseServiceImpl<EmsScqkLg, Date> imple
        List<EmsScqkLg> emsScqkLgs =  emsLgReportService.queryReportByTime();
        EmsScqkLg model;
        Integer number=0;
+       String[] ignoreArr = new String[] {"czsj","czr"};
        for(EmsScqkLg emsScqkLg :emsScqkLgs)
        {
            emsScqkLg.setCzr("炼钢MES");
@@ -51,9 +54,12 @@ public class EmsScqkLgServiceImpl extends BaseServiceImpl<EmsScqkLg, Date> imple
            model = emsScqkLgMapper.selectByPrimaryKey(emsScqkLg.getId());
            if(model == null){
               number += emsScqkLgMapper.insert(emsScqkLg);
-              continue;
+              return number ;
            }
-           number += emsScqkLgMapper.updateByPrimaryKeySelective(emsScqkLg);
+          Map map = CompareUtil.compareFields(model,emsScqkLg,ignoreArr);
+           System.out.println(map.toString());
+           //model.setGsrcl(emsScqkLg.getGsrcl());
+           //number += emsScqkLgMapper.updateByPrimaryKeySelective(emsScqkLg);
        }
         return number;
     }

src/main/java/com/steerinfo/ems/emsscqklg/service/impl/LgRealImpl.java

@@ -1,6 +1,5 @@
 package com.steerinfo.ems.emsscqklg.service.impl;
 
-import com.client.MswebserviceStub;
 import com.steerinfo.ems.Utils.MosaicUtils;
 import com.steerinfo.ems.Utils.StrUtils;
 import com.steerinfo.ems.emsscqklg.mapper.LgRealMapper;
@@ -26,37 +25,68 @@ public class LgRealImpl  implements ILgRealService {
     @Autowired
     private EmsLgReportService emsLgReportService;
 
-
-
-
     @Override
-    public List<LgReal> QueryLgReals() throws AxisFault {
-        List<LgReal> lgReals = emsLgReportService.queryReals();
-        MswebserviceStub stub;
-
+    public List<LgReal> QueryLgReals1() throws AxisFault {
+        List<LgReal> lgReals = emsLgReportService.queryReals1();
         if (lgReals.size() < 1) {
             logger.info("当前没有数据");
-            return emsLgReportService.queryReals();
+            return lgReals;
         }
-        try{
-            stub = new MswebserviceStub("http://172.16.90.229:9900");
-
-            // Open
-            MosaicUtils.SetOpenConnSample(stub);
-
-            for (LgReal model : lgReals) {
-                if (!StrUtils.isNumeric(model.getEng().trim())) {
-                    continue;
-                }
-                String sql = "update Ana set Eng='"+Double.parseDouble(model.getEng().trim())+"' where AltId='"+ model.getAltId()+"'";
-                MosaicUtils.SetUpdateValue(stub, sql);
+        MosaicUtils mosaicUtils = new MosaicUtils();
+        mosaicUtils.SetOpenConnSample();
+        StringBuilder sql = new StringBuilder();
+        lgReals.stream().forEach(s->{
+            //sql = "update Param set ValueText='"+model.getEng().trim()+"' where Rid='"+model.getAltId()+"'";
+            if (StrUtils.isNumeric(s.getEng())) {
+                sql.append("update Ana set Eng='");
+                sql.append(s.getEng());
+                sql.append("' where AltId=");
+                sql.append(s.getAltId());
+                mosaicUtils.SetUpdateValue(sql.toString());
+                sql.delete(0,sql.length());
+                return;
             }
-            // Close
-            MosaicUtils.SetCloseConnSample(stub);
-        } catch (AxisFault e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            sql.append("update Param set ValueText='");
+            sql.append(s.getEng());
+            sql.append("' where Rid=");
+            sql.append(s.getAltId());
+            mosaicUtils.SetUpdateValue(sql.toString());
+            sql.delete(0,sql.length());
+        });
+        // Close
+        mosaicUtils.SetCloseConnSample();
+        return lgReals;
+    }
+    @Override
+    public List<LgReal> QueryLgReals2() throws AxisFault {
+        List<LgReal> lgReals = emsLgReportService.queryReals2();
+        if (lgReals.size() < 1) {
+            logger.info("当前没有数据");
+            return lgReals;
         }
-        return emsLgReportService.queryReals();
+        MosaicUtils mosaicUtils = new MosaicUtils();
+        mosaicUtils.SetOpenConnSample();
+        StringBuilder sql = new StringBuilder();
+        lgReals.stream().forEach(s->{
+            //sql = "update Param set ValueText='"+model.getEng().trim()+"' where Rid='"+model.getAltId()+"'";
+            if (StrUtils.isNumeric(s.getEng())) {
+                sql.append("update Ana set Eng='");
+                sql.append(s.getEng());
+                sql.append("' where AltId=");
+                sql.append(s.getAltId());
+                mosaicUtils.SetUpdateValue(sql.toString());
+                sql.delete(0,sql.length());
+                return;
+            }
+            sql.append("update Param set ValueText='");
+            sql.append(s.getEng());
+            sql.append("' where Rid=");
+            sql.append(s.getAltId());
+            mosaicUtils.SetUpdateValue(sql.toString());
+            sql.delete(0,sql.length());
+        });
+        // Close
+        mosaicUtils.SetCloseConnSample();
+        return lgReals;
     }
 }

src/main/java/com/steerinfo/ems/emswaterrealtime/service/impl/EmsWaterRealtimeServiceImpl.java

@@ -1,8 +1,8 @@
 package com.steerinfo.ems.emswaterrealtime.service.impl;
 
-import com.client.MswebserviceStub;
 import com.steerinfo.auth.utils.JwtUtil;
 import com.steerinfo.ems.Utils.DateUtils;
+import com.steerinfo.ems.Utils.MosaicUtils;
 import com.steerinfo.ems.emswaterrealtime.mapper.EmsWaterRealtimeMapper;
 import com.steerinfo.ems.emswaterrealtime.model.EmsWaterRealtime;
 import com.steerinfo.ems.emswaterrealtime.service.IEmsWaterRealtimeService;
@@ -14,13 +14,11 @@ import com.steerinfo.framework.datasource.DataSourceKey;
 import com.steerinfo.framework.datasource.TargetDataSource;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import org.apache.axis2.AxisFault;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.rmi.RemoteException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -149,117 +147,126 @@ public class EmsWaterRealtimeServiceImpl extends BaseServiceImpl<EmsWaterRealtim
         //return addSize+updateSize;
     }
 
-    static MswebserviceStub.UserInfo userInfo = new MswebserviceStub.UserInfo();
-
     /***
      * 从大用户水系统获取数据到Mosaic
      */
     @Override
     public void getWaterListToMosaic() {
         List<EmsWaterRealtime> emsWaterRealtimeList = emsWaterRealtimeMapper.getWaterListToMosaic();
-        MswebserviceStub stub;
-        userInfo = new MswebserviceStub.UserInfo();
         //0x0069:032e:0 瞬时流量
         //0x020b:483d:0 累计流量
         //0x006b:41df:0 压力
-        final String SS="0x0069:032e:0";
-        final String LJ="0x020b:483d:0";
-        final String YL="0x006b:41df:0";
-        try {
-         stub=new MswebserviceStub("http://172.16.90.229:9900");
-        userInfo.setMdbName("scada");
-        userInfo.setMdbInstance("master");
-        userInfo.setComText("");
-        userInfo.setMIP("");
-        userInfo.setMUserID("");
-        userInfo.setMUserName("mosaic");
-        userInfo.setMUserPass("mosaic");
-        // Open
-        SetOpenConnSample(stub);
-        for(EmsWaterRealtime emswater:emsWaterRealtimeList) {
-            //Equip:Desig='11KV变电站' and Quantity:Name='累计流量'
-            if(emswater.getMosaicid()==null||"".equals(emswater.getMosaicid()))
-            {
-                continue;
-            }
-            String sql="update Ana set Eng='"+emswater.getSumvalue()+"' where Equip="+emswater.getMosaicid()+"";
-           switch (emswater.getmType()){
-               case "SS":
-                   sql+=" AND Quantity="+SS+"";
-               break;
-               case "YL":
-                   sql+=" AND Quantity="+YL+"";
-               break;
-               default:
-                   sql+=" AND Quantity="+LJ+"";
-               break;
+        //final String SS="0x0069:032e:0";
+        //final String LJ="0x020b:483d:0";
+        //final String YL="0x006b:41df:0";
+        //open
+        MosaicUtils.SetOpenConnSample();
+        StringBuilder sql = new StringBuilder("update Ana set Eng='");
+        emsWaterRealtimeList.stream().forEach(s->{
+            //sql = "update Param set ValueText='"+model.getEng().trim()+"' where Rid='"+model.getAltId()+"'";
+          if(s.getMosaicid()==null||"".equals(s.getMosaicid())) {return;}
+            //sql.append("update Ana set Eng='");
+            sql.append(s.getSumvalue());
+            sql.append("' where Equip=");
+            sql.append(s.getMosaicid());
+            //MosaicUtils.SetUpdateValue(sql.toString());
+            //sql.delete(0,sql.length());
+            switch (s.getmType()){
+                case "SS":
+                    sql.append(" AND Quantity=0x0069:032e:0");
+                    break;
+                case "YL":
+                    sql.append(" AND Quantity=0x006b:41df:0");
+                    break;
+                default:
+                    sql.append(" AND Quantity=0x020b:483d:0");
+                    break;
             }
-            // Update
-            SetUpdateValue(stub,sql);
-        }
+            MosaicUtils.SetUpdateValue(sql.toString());
+            sql.delete(20,sql.length());
+        });
         // Close
-        SetCloseConnSample(stub);
-    } catch (AxisFault e) {
-        // TODO Auto-generated catch block
-        e.printStackTrace();
-    }
-    }
-
-    private static void SetOpenConnSample(MswebserviceStub stub) {
-        try {
-            MswebserviceStub.WSConnectOpen openReq = new MswebserviceStub.WSConnectOpen();
-            MswebserviceStub.WSConnectOpenResponse openResp = null;
-            // Open
-            openReq.setUserInfo(userInfo);
-
-            openResp = stub.wSConnectOpen(openReq);
-            System.out.println("打开mosaic链接成功");
-            // Save UserID
-            userInfo.setMUserID(openResp.getId());
-
-        } catch (RemoteException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-            System.out.println("打开mosaic链接失败");
-        }
-
+        MosaicUtils.SetCloseConnSample();
+        //for(EmsWaterRealtime emswater:emsWaterRealtimeList) {
+        //    //Equip:Desig='11KV变电站' and Quantity:Name='累计流量'
+        //    if(emswater.getMosaicid()==null||"".equals(emswater.getMosaicid()))
+        //    {
+        //        continue;
+        //    }
+        //   sql.append(emswater.getSumvalue());
+        //   sql.append(emswater.getMosaicid());
+        //    ="update Ana set Eng='"+emswater.getSumvalue()+"' where Equip="+emswater.getMosaicid()+"";
+        //   switch (emswater.getmType()){
+        //       case "SS":
+        //           sql+=" AND Quantity="+SS+"";
+        //       break;
+        //       case "YL":
+        //           sql+=" AND Quantity="+YL+"";
+        //       break;
+        //       default:
+        //           sql+=" AND Quantity="+LJ+"";
+        //       break;
+        //    }
+        //    // Update
+        //    MosaicUtils.SetUpdateValue(sql.toString());
+        //}
     }
 
-    // 更新点的值
-    private static void SetUpdateValue(MswebserviceStub stub,String sql) {
-        // 0x0002:5365:2e
-        MswebserviceStub.DataResult queryData = new MswebserviceStub.DataResult();
-
-        try {
-
-            //String sql = "update Ana set(Eng,User)=(100,0x0002:5365:2e) where AltId='PUMP1_SPEED' ";
-            // Dig表为 update Dig set(Cs,User)=(1,0x0002:5365:2e) update Ana set Eng='1812482' where Equip='0x06f4:0bfe:1e' AND Quantity='0x006a:489c:22'
-
-            userInfo.setComText(sql);
-            MswebserviceStub.WSQueryExecute query = new MswebserviceStub.WSQueryExecute();
-            query.setUserInfo(userInfo);
-            queryData = stub.wSQueryExecute(query);
-            //System.out.println(queryData.getData());
+    //private static void SetOpenConnSample(MswebserviceStub stub) {
+    //    try {
+    //        MswebserviceStub.WSConnectOpen openReq = new MswebserviceStub.WSConnectOpen();
+    //        MswebserviceStub.WSConnectOpenResponse openResp = null;
+    //        // Open
+    //        openReq.setUserInfo(userInfo);
+    //
+    //        openResp = stub.wSConnectOpen(openReq);
+    //        System.out.println("打开mosaic链接成功");
+    //        // Save UserID
+    //        userInfo.setMUserID(openResp.getId());
+    //
+    //    } catch (RemoteException e) {
+    //        // TODO Auto-generated catch block
+    //        e.printStackTrace();
+    //        System.out.println("打开mosaic链接失败");
+    //    }
+    //
+    //}
 
-        } catch (RemoteException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-    }
+    //// 更新点的值
+    //private static void SetUpdateValue(MswebserviceStub stub,String sql) {
+    //    // 0x0002:5365:2e
+    //    MswebserviceStub.DataResult queryData = new MswebserviceStub.DataResult();
+    //
+    //    try {
+    //
+    //        //String sql = "update Ana set(Eng,User)=(100,0x0002:5365:2e) where AltId='PUMP1_SPEED' ";
+    //        // Dig表为 update Dig set(Cs,User)=(1,0x0002:5365:2e) update Ana set Eng='1812482' where Equip='0x06f4:0bfe:1e' AND Quantity='0x006a:489c:22'
+    //
+    //        userInfo.setComText(sql);
+    //        MswebserviceStub.WSQueryExecute query = new MswebserviceStub.WSQueryExecute();
+    //        query.setUserInfo(userInfo);
+    //        queryData = stub.wSQueryExecute(query);
+    //        //System.out.println(queryData.getData());
+    //
+    //    } catch (RemoteException e) {
+    //        // TODO Auto-generated catch block
+    //        e.printStackTrace();
+    //    }
+    //}
 
-    // 关闭mosaic链接
-    private static void SetCloseConnSample(MswebserviceStub stub) {
-        MswebserviceStub.WSConnectClose closeReq = new MswebserviceStub.WSConnectClose();
-        closeReq.setUserInfo(userInfo);
-        try {
-            stub.wSConnectClose(closeReq);
-            userInfo = null;
-            System.out.println("关闭mosaic链接成功");
-        } catch (RemoteException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-    }
+    //// 关闭mosaic链接
+    //private static void SetCloseConnSample(MswebserviceStub stub) {
+    //    MswebserviceStub.WSConnectClose closeReq = new MswebserviceStub.WSConnectClose();
+    //    closeReq.setUserInfo(userInfo);
+    //    try {
+    //        stub.wSConnectClose(closeReq);
+    //        userInfo = null;
+    //        System.out.println("关闭mosaic链接成功");
+    //    } catch (RemoteException e) {
+    //        // TODO Auto-generated catch block
+    //        e.printStackTrace();
+    //    }
+    //}
 
     @Autowired
     IFormulaService formulaService;

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

@@ -52,6 +52,7 @@
     <result column="UPDATEMAN" jdbcType="VARCHAR" property="updateman" />
     <result column="UPDATETIME" jdbcType="TIMESTAMP" property="updatetime" />
     <result column="MINTIMEGRANID" jdbcType="VARCHAR" property="mintimegranid" />
+    <result column="TRANSFER" jdbcType="VARCHAR" property="transfer" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from T_RM_CALPOINT
@@ -198,6 +199,9 @@
       <if test="mintimegranid != null and mintimegranid != ''">
         and MINTIMEGRANID = #{mintimegranid}
       </if>
+    <if test="transfer != null and transfer != ''">
+      and TRANSFER = #{transfer}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.ems.trmcalpoint.model.TRmCalpoint">
     insert into T_RM_CALPOINT (ITEMID, ITEMNAME, ITEMDESC,
@@ -210,7 +214,7 @@
       TAG_MODULUS, METER_TYPE, METER_SCALE,
       METER_LOC, TAG_BAD_SYMBOL, SOURCE_TYPE,
       REC_TIME, ISSETTLE, ISSCHEDULE,
-      TAG_COL,MINTIMEGRANID)
+      TAG_COL,MINTIMEGRANID,TRANSFER)
     values (#{itemid,jdbcType=VARCHAR}, #{itemname,jdbcType=VARCHAR}, #{itemdesc,jdbcType=VARCHAR},
       #{locateid,jdbcType=VARCHAR}, #{networkid,jdbcType=VARCHAR}, #{energyid,jdbcType=VARCHAR},
       #{energytypeid,jdbcType=VARCHAR}, #{unitid,jdbcType=VARCHAR}, #{costid,jdbcType=VARCHAR},
@@ -226,7 +230,7 @@
       #{tagModulus,jdbcType=DECIMAL}, #{meterType,jdbcType=VARCHAR}, #{meterScale,jdbcType=DECIMAL},
       #{meterLoc,jdbcType=VARCHAR}, #{tagBadSymbol,jdbcType=VARCHAR}, #{sourceType,jdbcType=VARCHAR},
       #{recTime,jdbcType=VARCHAR}, #{issettle,jdbcType=VARCHAR}, #{isschedule,jdbcType=VARCHAR},
-      #{tagCol,jdbcType=VARCHAR},#{mintimegranid,jdbcType=VARCHAR})
+      #{tagCol,jdbcType=VARCHAR},#{mintimegranid,jdbcType=VARCHAR},#{transfer,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.ems.trmcalpoint.model.TRmCalpoint">
     insert into T_RM_CALPOINT
@@ -372,6 +376,9 @@
       <if test="mintimegranid != null">
         MINTIMEGRANID,
       </if>
+      <if test="transfer != null">
+        TRANSFER,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="itemid != null">
@@ -515,6 +522,9 @@
       <if test="mintimegranid != null">
         #{mintimegranid,jdbcType=VARCHAR},
       </if>
+      <if test="transfer != null">
+        #{transfer,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.ems.trmcalpoint.model.TRmCalpoint">
@@ -566,7 +576,8 @@
       TAG_COL = #{tagCol,jdbcType=VARCHAR},
       UPDATEMAN = #{updateman, jdbcType=VARCHAR},
       UPDATETIME = SYSDATE,
-      MINTIMEGRANID = #{mintimegranid, jdbcType=VARCHAR}
+      MINTIMEGRANID = #{mintimegranid, jdbcType=VARCHAR},
+      TRANSFER = #{transfer, jdbcType=VARCHAR}
     where ITEMID = #{itemid,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.ems.trmcalpoint.model.TRmCalpoint">
@@ -716,6 +727,9 @@
       <if test="updatetime != null">
         UPDATETIME = SYSDATE,
       </if>
+      <if test="transfer != null">
+        TRANSFER = #{transfer, jdbcType=VARCHAR},
+      </if>
     </set>
     where ITEMID = #{itemid,jdbcType=VARCHAR}
   </update>
@@ -726,7 +740,7 @@
     DIGITS, SEQNO, SHOWNO, STATUS, NODE, PARENTID, BCODE, BDESC1, BDESC2, BTYPE1, BTYPE2, RANGE_VAL,
     TAG_ID_MAP, CALC_MOD, DATA_TYPE, TAG_TABLE, MAX_VAL, MIN_VAL, AVG_VAL, SUM_VAL, TAG_MODULUS,
     METER_TYPE, METER_SCALE, METER_LOC, TAG_BAD_SYMBOL, SOURCE_TYPE, REC_TIME, ISSETTLE,
-    ISSCHEDULE, TAG_COL, UPDATEMAN, UPDATETIME, MINTIMEGRANID
+    ISSCHEDULE, TAG_COL, UPDATEMAN, UPDATETIME, MINTIMEGRANID,TRANSFER
     from T_RM_CALPOINT
     where ITEMID = #{itemid,jdbcType=VARCHAR}
   </select>
@@ -736,7 +750,7 @@
     DIGITS, SEQNO, SHOWNO, STATUS, NODE, PARENTID, BCODE, BDESC1, BDESC2, BTYPE1, BTYPE2, RANGE_VAL,
     TAG_ID_MAP, CALC_MOD, DATA_TYPE, TAG_TABLE, MAX_VAL, MIN_VAL, AVG_VAL, SUM_VAL, TAG_MODULUS,
     METER_TYPE, METER_SCALE, METER_LOC, TAG_BAD_SYMBOL, SOURCE_TYPE, REC_TIME, ISSETTLE,
-    ISSCHEDULE, TAG_COL, UPDATEMAN, UPDATETIME, MINTIMEGRANID
+    ISSCHEDULE, TAG_COL, UPDATEMAN, UPDATETIME, MINTIMEGRANID,TRANSFER
     from T_RM_CALPOINT
     <where>
       <if test="itemid != null and itemid != ''">
@@ -880,6 +894,9 @@
       <if test="mintimegranid != null and mintimegranid != ''">
         and MINTIMEGRANID = #{mintimegranid}
       </if>
+      <if test="transfer != null and mintimegranid != ''">
+        and TRANSFER = #{transfer}
+      </if>
     </where>
     order by SHOWNO
   </select>
@@ -889,7 +906,7 @@
     DIGITS, SEQNO, SHOWNO, STATUS, NODE, PARENTID, BCODE, BDESC1, BDESC2, BTYPE1, BTYPE2, RANGE_VAL,
     TAG_ID_MAP, CALC_MOD, DATA_TYPE, TAG_TABLE, MAX_VAL, MIN_VAL, AVG_VAL, SUM_VAL, TAG_MODULUS,
     METER_TYPE, METER_SCALE, METER_LOC, TAG_BAD_SYMBOL, SOURCE_TYPE, REC_TIME, ISSETTLE,
-    ISSCHEDULE, TAG_COL, UPDATEMAN, UPDATETIME, MINTIMEGRANID
+    ISSCHEDULE, TAG_COL, UPDATEMAN, UPDATETIME, MINTIMEGRANID,TRANSFER
     from T_RM_CALPOINT
     <where>
       <if test="itemid != null and itemid != ''">
@@ -1033,6 +1050,9 @@
       <if test="mintimegranid != null and mintimegranid != ''">
         and MINTIMEGRANID = #{mintimegranid}
       </if>
+      <if test="transfer != null and transfer != ''">
+        and TRANSFER = #{transfer}
+      </if>
     </where>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
@@ -1052,7 +1072,7 @@
       AVG_VAL, SUM_VAL, TAG_MODULUS,
       METER_TYPE, METER_SCALE, METER_LOC,
       TAG_BAD_SYMBOL, SOURCE_TYPE, REC_TIME,
-      ISSETTLE, ISSCHEDULE, TAG_COL, MINTIMEGRANID
+      ISSETTLE, ISSCHEDULE, TAG_COL, MINTIMEGRANID, TRANSFER
       )
     ( <foreach collection="list" item="item" separator="union all">
    select
@@ -1071,7 +1091,7 @@
       #{item.avgVal,jdbcType=VARCHAR}, #{item.sumVal,jdbcType=VARCHAR}, #{item.tagModulus,jdbcType=DECIMAL},
       #{item.meterType,jdbcType=VARCHAR}, #{item.meterScale,jdbcType=DECIMAL}, #{item.meterLoc,jdbcType=VARCHAR},
       #{item.tagBadSymbol,jdbcType=VARCHAR}, #{item.sourceType,jdbcType=VARCHAR}, #{item.recTime,jdbcType=VARCHAR},
-      #{item.issettle,jdbcType=VARCHAR}, #{item.isschedule,jdbcType=VARCHAR}, #{item.tagCol,jdbcType=VARCHAR}, #{item.mintimegranid,jdbcType=VARCHAR}
+      #{item.issettle,jdbcType=VARCHAR}, #{item.isschedule,jdbcType=VARCHAR}, #{item.tagCol,jdbcType=VARCHAR}, #{item.mintimegranid,jdbcType=VARCHAR}, #{item.transfer,jdbcType=VARCHAR}
        from dual
    </foreach> )
   </insert>
@@ -1274,6 +1294,10 @@
         <foreach collection="list" item="item" index="index" separator=" " open="case ITEMID" close="end">
             when #{item.itemid,jdbcType=VARCHAR} then SYSDATE
         </foreach>
+    ,TRANSFER=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ITEMID" close="end">
+      when #{item.itemid,jdbcType=VARCHAR} then transfer
+    </foreach>
      where ITEMID in
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item.itemid,jdbcType=VARCHAR}

src/main/java/com/steerinfo/ems/trmcalpoint/model/TRmCalpoint.java

@@ -307,6 +307,12 @@ public class TRmCalpoint implements IBasePO<String> {
     @ApiModelProperty(value="最小时间粒度",required=false)
     private String mintimegranid;
 
+    /**
+     * 转供工序(TRANSFER,VARCHAR,30)
+     */
+    @ApiModelProperty(value="转供工序",required=false)
+    private String transfer;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -719,7 +725,15 @@ public class TRmCalpoint implements IBasePO<String> {
 		this.mintimegranid = mintimegranid;
 	}
 
-	@Override
+    public String getTransfer() {
+        return transfer;
+    }
+
+    public void setTransfer(String transfer) {
+        this.transfer = transfer;
+    }
+
+    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(getClass().getSimpleName());
@@ -775,6 +789,7 @@ public class TRmCalpoint implements IBasePO<String> {
         sb.append(", updateman=").append(updateman);
         sb.append(", updatetime=").append(updatetime);
         sb.append(", mintimegranid=").append(mintimegranid);
+        sb.append(", transfer=").append(transfer);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/ems/trmindexitem/controller/TRmIndexItemController.java

@@ -138,6 +138,10 @@ public class TRmIndexItemController extends BaseRESTfulController {
                 model.setItemflag("2");
             }
         }
+        //显示顺序
+        // String seqno = params.get("seqno") == null ? "10" :(String)params.get("seqno");
+        Integer seqno = tRmIndexItemService.getMaxSeqNo(model)==null? 1 :tRmIndexItemService.getMaxSeqNo(model)+1;
+        model.setSeqno(seqno);
         TRmIndexItem  tRmIndexItem= tRmIndexItemService.add(model);
         return success(tRmIndexItem);
     }
@@ -207,8 +211,6 @@ public class TRmIndexItemController extends BaseRESTfulController {
         String unitid  = (String)params.get("unitid");
         //数值精度
         String digits = params.get("digits") == null || params.get("digits").toString().isEmpty() ? "2" :params.get("digits").toString();
-        //显示顺序
-        // String seqno = params.get("seqno") == null ? "10" :(String)params.get("seqno");
         //父级id
         String parentid = (String) params.get("parentid");
         //属性
@@ -226,6 +228,14 @@ public class TRmIndexItemController extends BaseRESTfulController {
     	if(lm!=null && lm.size()>0){
 			return failed(null, "同指标类型、同用途、同能介、同工序、同工厂不允许重复增加");
 		}
+        TRmIndexItem model = new TRmIndexItem();
+        model.setIndextype(indexId);
+        model.setItemflag("3");
+        model.setParentid(parentid);
+        model.setItemtype(itemtype);
+        //显示顺序
+        // String seqno = params.get("seqno") == null ? "10" :(String)params.get("seqno");
+        Integer seqno = tRmIndexItemService.getMaxSeqNo(model)==null? 1 :tRmIndexItemService.getMaxSeqNo(model)+1;
         //项目id
         TRmIndexItem tRmIndexItem = new TRmIndexItem();
         tRmIndexItem.setItemdesc(itemdesc);
@@ -241,7 +251,7 @@ public class TRmIndexItemController extends BaseRESTfulController {
         tRmIndexItem.setUseflag("1");
         tRmIndexItem.setUnitid(unitid);
         tRmIndexItem.setDigits(Short.parseShort(digits));
-        tRmIndexItem.setSeqno(10);
+        tRmIndexItem.setSeqno(seqno);
         tRmIndexItem.setParentid(parentid);
         tRmIndexItem.setItemflag("3");
         tRmIndexItem.setPropertyid(propertyid);

src/main/java/com/steerinfo/ems/trmindexitem/mapper/TRmIndexItemMapper.java

@@ -2,14 +2,13 @@ package com.steerinfo.ems.trmindexitem.mapper;
 
 import com.steerinfo.ems.trmindexitem.model.TRmIndexItem;
 import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
 @Mapper
 public interface TRmIndexItemMapper extends IBaseMapper<TRmIndexItem, String> {
 
@@ -109,4 +108,11 @@ public interface TRmIndexItemMapper extends IBaseMapper<TRmIndexItem, String> {
      */
     List<TRmIndexItem> selectByParasForFla(Map<String, Object> m);
 
+	/**
+	 * 取最大序号
+	 *
+	 * @return
+	 */
+	Integer getMaxSeqNo(TRmIndexItem tRmIndexItem);
+
 }

src/main/java/com/steerinfo/ems/trmindexitem/mapper/TRmIndexItemMapper.xml

@@ -652,7 +652,7 @@
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
-	order by INDEXTYPE,ITEMTYPE,WORKPROCID
+	order by FACTORYID,INDEXTYPE,ITEMTYPE,WORKPROCID,SEQNO
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into T_RM_INDEX_ITEM 
@@ -986,6 +986,7 @@
               AND  PARENTID = #{parentid}
             </if>
         </where>
+      order by SEQNO
     </select>
 
     <!--求最大id值-->
@@ -1102,4 +1103,26 @@
 	    <include refid="where"/>
 	    order by seqno
 	</select>
+
+
+  <!--求最大序号-->
+  <select id="getMaxSeqNo" parameterType="com.steerinfo.ems.trmindexitem.model.TRmIndexItem" resultType="int">
+    SELECT nvl(MAX(SEQNO),1)
+    FROM
+    T_RM_INDEX_ITEM
+    <where>
+      <if test="indextype != null and indextype != ''">
+        AND INDEXTYPE = #{indextype}
+      </if>
+      <if test="itemflag !=null and itemflag!=''">
+        AND  ITEMFLAG = #{itemflag}
+      </if>
+      <if test="parentid !=null and parentid !=''">
+        AND  PARENTID = #{parentid}
+      </if>
+      <if test="itemtype !=null and itemtype !=''">
+        AND  ITEMTYPE = #{itemtype}
+      </if>
+    </where>
+  </select>
 </mapper>

src/main/java/com/steerinfo/ems/trmindexitem/service/ITRmIndexItemService.java

@@ -1,16 +1,14 @@
 package com.steerinfo.ems.trmindexitem.service;
 
+import com.steerinfo.ems.trmindexitem.model.TRmIndexItem;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.steerinfo.ems.trmindexitem.model.TRmIndexItem;
-import io.swagger.models.auth.In;
-import org.apache.ibatis.annotations.Param;
-
 /**
  * TRmIndexItem服务接口：
  * @author generator
@@ -138,4 +136,10 @@ public interface ITRmIndexItemService extends IBaseService<TRmIndexItem, String>
 	 */
 	PageList<TRmIndexItem> queryLikewForPage(HashMap<String, Object> parmas, Integer pageNum, Integer pageSize);
 
+	/**
+	 * 求最大的序号
+	 * @param tRmIndexItem
+	 * @return
+	 */
+	public Integer getMaxSeqNo(TRmIndexItem tRmIndexItem);
 }

src/main/java/com/steerinfo/ems/trmindexitem/service/impl/TRmIndexItemServiceImpl.java

@@ -1,22 +1,21 @@
 package com.steerinfo.ems.trmindexitem.service.impl;
 
+import com.steerinfo.ems.formula.mapper.FormulaMapper;
+import com.steerinfo.ems.trmindexitem.mapper.TRmIndexItemMapper;
+import com.steerinfo.ems.trmindexitem.model.TRmIndexItem;
+import com.steerinfo.ems.trmindexitem.service.ITRmIndexItemService;
 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.trmindexitem.model.TRmIndexItem;
-import com.steerinfo.ems.formula.mapper.FormulaMapper;
-import com.steerinfo.ems.trmindexitem.mapper.TRmIndexItemMapper;
-import com.steerinfo.ems.trmindexitem.service.ITRmIndexItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 /**
  * TRmIndexItem服务实现：
  * @author generator
@@ -137,4 +136,8 @@ public class TRmIndexItemServiceImpl extends BaseServiceImpl<TRmIndexItem, Strin
         return pageInfo;
 	}
 
+    @Override
+    public Integer getMaxSeqNo(TRmIndexItem tRmIndexItem) {
+        return tRmIndexItemMapper.getMaxSeqNo(tRmIndexItem);
+    }
 }

src/main/java/com/steerinfo/ems/trmindexvalue/mapper/TRmIndexValueMapper.xml

@@ -517,7 +517,7 @@
 		SELECT
 		a.itemid ,b.ITEMNAME,a.ACTUALVALUE,a.CORRECTVALUE,a.APPORTVALUE,a.SUMVALUE,b.UNITID,a.REC_TIME,a.MODIFYFLAG,
 		a.TIMEGRANID,a.CLOCK,b.ITEMTYPE,a.BZ, b.WORKPROCID,a.rec_user,a.upman,a.uptime,a.refvalue,
-        b.ENERGYID,b.CODE,b.propertyid
+        b.ENERGYID,a.CODE,b.propertyid
 		FROM
 		T_RM_INDEX_VALUE a
 		INNER JOIN

src/main/java/com/steerinfo/ems/trmindexvalue/service/impl/TRmIndexValueServiceImpl.java

@@ -1,15 +1,14 @@
 package com.steerinfo.ems.trmindexvalue.service.impl;
 
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.ems.trmindexvalue.model.TRmIndexValue;
-import com.steerinfo.auth.utils.JwtUtil;
 import com.steerinfo.ems.Utils.BigDecimalUtil;
 import com.steerinfo.ems.formula.service.IFormulaService;
 import com.steerinfo.ems.trmindexitem.mapper.TRmIndexItemMapper;
 import com.steerinfo.ems.trmindexitem.model.TRmIndexItem;
 import com.steerinfo.ems.trmindexvalue.mapper.TRmIndexValueMapper;
+import com.steerinfo.ems.trmindexvalue.model.TRmIndexValue;
 import com.steerinfo.ems.trmindexvalue.service.ITRmIndexValueService;
+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.slf4j.Logger;
@@ -17,16 +16,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 
 /**
@@ -125,6 +119,7 @@ public class TRmIndexValueServiceImpl extends BaseServiceImpl<TRmIndexValue, Has
 			return "项目不存在，itemid：" + itemid;
 		}
 		Short digits =  t.getDigits()== null ? 2 : t.getDigits();
+		int code = t.getSeqno()== null ? 2 : t.getSeqno();
 		if(timegranid.equalsIgnoreCase("DAY") && !t.getMintimegranid().equalsIgnoreCase("DAY")){
 			return "最小粒度不匹配";
 		} else {
@@ -179,6 +174,9 @@ public class TRmIndexValueServiceImpl extends BaseServiceImpl<TRmIndexValue, Has
 		            tv.setApportvalue(BigDecimalUtil.add(tv.getCorrectvalue()!=null?tv.getCorrectvalue().doubleValue():0d, actualvalue).setScale(digits, RoundingMode.HALF_UP));
 		            tv.setUpman(opuser);
 		            tv.setRefvalue(refvalue);
+					if(tv.getCode().equals(null)) {
+						tv.setCode((short)code);
+					}
 		            tv.setUptime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
 		            tRmIndexValueMapper.updateByPrimaryKeySelective(tv);
 				}else if(tv==null){
@@ -187,6 +185,7 @@ public class TRmIndexValueServiceImpl extends BaseServiceImpl<TRmIndexValue, Has
 					tv.setClock(clock);
 					tv.setRefvalue(refvalue);
 					tv.setTimegranid(timegranid);
+					tv.setCode((short)code);
 					tv.setActualvalue(new BigDecimal(Double.toString(actualvalue)).setScale(digits, RoundingMode.HALF_UP));
 					tv.setCorrectvalue(BigDecimal.ZERO);
 					tv.setApportvalue(new BigDecimal(Double.toString(actualvalue)).setScale(digits, RoundingMode.HALF_UP));

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

@@ -47,7 +47,7 @@ import org.springframework.stereotype.Service;
 
 import javax.script.ScriptException;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.util.Properties;import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
@@ -199,7 +199,6 @@ public class SpringCronTask implements SchedulingConfigurer{
 		}
 		taskFutures.remove(taskId);
 	}
-
 	/**
 	 * 业务处理
 	 *
@@ -302,13 +301,13 @@ public class SpringCronTask implements SchedulingConfigurer{
 					 logger.info("定时任务"+taskId+"执行时长：" + (new Date().getTime() - start)/1000 + "秒");
 				 }
 				 else if (taskId.equalsIgnoreCase("123")) {
-					 // 大宗物料收发数据(每天1点);炼钢mes生成日报每天(0点57分，4点57分)
-					 long start = new Date().getTime();
+					 // 大宗物料收发数据，从炼钢mes调度日报生成生产日报每天(0点57分，4点57分,8点57分)
+					 long start = System.currentTimeMillis();
 					 dzMaterialSfService.dataGeneration();
 					 emsScqkLgService.dateGenerate();
-					 logger.info("定时任务"+taskId+"执行时长：" + (new Date().getTime() - start)/1000 + "秒");
-				}
-				 else if(taskId.equalsIgnoreCase("124")){
+					logger.info("定时任务"+taskId+"执行时长：" + (System.currentTimeMillis() - start)/1000 + "秒");
+				} 
+				else if(taskId.equalsIgnoreCase("124")){
 					 long start = new Date().getTime();
 					 try {
 					 	 foldTheValuesService.getData();
@@ -321,29 +320,7 @@ public class SpringCronTask implements SchedulingConfigurer{
 						 e.printStackTrace();
 					 }
 					 logger.info("定时任务"+taskId+"执行时长：" + (new Date().getTime() - start)/1000 + "秒");
-				 }
-				 //else if (taskId.equalsIgnoreCase("124")) {
-				// // 每10秒获取一次炼钢实时数据传入mosaic
-				// long start = System.currentTimeMillis();
-				// try {
-				//	 lgRealService.QueryLgReals();
-				// } catch (AxisFault e) {
-				//	 e.printStackTrace();
-				// }
-				// logger.info("定时任务"+taskId+"执行时长：" + (System.currentTimeMillis() - start)/1000 + "秒");
-				//}
-//				 else if (taskId.equalsIgnoreCase("124")) {
-//					 Date now = new Date();
-//					 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
-//					 Calendar c = Calendar.getInstance();
-//					 if (c.get(Calendar.DATE) == 1) {
-//						 long start = new Date().getTime();
-//						 emsGmPcJhService.addNbjh();
-//						 logger.info("定时任务"+taskId+"执行时长：" + (new Date().getTime() - start)/1000 + "秒");
-//					 }
-//
-//				 }
-//				 else if (taskId.equalsIgnoreCase("106")) {
+				 }//				 else if (taskId.equalsIgnoreCase("106")) {
 //					// 获取MES水质监测数据
 //					long start = new Date().getTime();
 //					ifMesEmsWatermonitorService.synchronousMesAnEmsData();

src/main/resources/bootstrap.yml

@@ -21,12 +21,19 @@ spring:
       enabled: false
 #feign的超时时间
 feign:
+  httpclient:
+    # 让feign使用Apache HTTPClient做请求，而不是默认的urlConnection
+    enabled: true
+    # feign最大连接数
+    max-connections: 200
+    # feign单个路径的最大连接数
+    max-connections-per-route: 50
   client:
     config:
       default:
         connectTimeout: 5000
         readTimeout: 10000
-        loggerLevel: full
+        loggerLevel: basic
 server:
   port: ${SERVER_PORT:8086}
   tomcat: