新增测温数据导入功能及修改测温uuid

pom.xml

@@ -54,13 +54,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.6</version>
+            <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
+            <version>3.2.4</version>
         </dependency>
         <!--添加webservice end-->
         <dependency>

src/main/java/com/DepotIntelligentApplication.java

@@ -23,27 +23,6 @@ public class DepotIntelligentApplication {
 		SpringApplication.run(DepotIntelligentApplication.class, args);
 	}
 
-	/**
-	 * 注册一个dispatcherServlet,解决增加ws之后https接口访问不了问题
-	 */
-	@Bean
-	public ServletRegistrationBean restServlet(){
-		//注解扫描上下文
-		AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext();
-		//base package
-		applicationContext.scan("com.unissoft");
-		//通过构造函数指定dispatcherServlet的上下文
-		DispatcherServlet rest_dispatcherServlet = new DispatcherServlet(applicationContext);
-		//用ServletRegistrationBean包装servlet
-		ServletRegistrationBean registrationBean = new ServletRegistrationBean(rest_dispatcherServlet);
-		registrationBean.setLoadOnStartup(1);
-		//指定urlmapping
-		registrationBean.addUrlMappings("/*");
-		//指定name，如果不指定默认为dispatcherServlet
-		registrationBean.setName("rest");
-		return registrationBean;
-	}
-
 	@Bean
 	public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
 		return new ThreadPoolTaskScheduler();

src/main/java/com/chinaitop/depot/intelligent/grainsituation/controller/TemperImportController.java

@@ -0,0 +1,85 @@
+package com.chinaitop.depot.intelligent.grainsituation.controller;
+
+import com.chinaitop.depot.intelligent.grainsituation.service.TemperImportService;
+import com.chinaitop.depot.intelligent.utils.ImportServiceImpl;
+import com.unissoft.model.TypeEnum;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author qingsong.han
+ * @description: 粮温历史数据导入
+ * @create 2020-08-03 9:39
+ */
+@RestController
+@RequestMapping(value = "/intelligentTemperature")
+public class TemperImportController {
+//    final static Logger logger = LoggerFactory.getLogger(GrainPushsServiceImpl.class);
+
+    @Resource
+    private ImportServiceImpl importService;
+    @Autowired
+    private TemperImportService temperImportService;
+
+    /**
+     * 导入excel
+     *
+     * @param file     文件
+     * @param fileType 类型：如xlsx
+     * @param orgId    组织机构id
+     * @return
+     */
+    @RequestMapping(value = "/importFile", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value = "导入excel", notes = "导入excel")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "文件数据", paramType = "query"),
+            @ApiImplicitParam(name = "fileType", value = "文件后缀", paramType = "query"),
+            @ApiImplicitParam(name = "rootPath", value = "路径", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query")
+    })
+    public Map<String, Object> importFile(MultipartFile file, String fileType, HttpServletRequest request, Integer orgId) {
+
+        String[] titleArr = {"测温线缆列号(X)", "测温线缆行号(Y)", "测温点高度(Z)", "温度值"};//第一行的title
+        boolean[] emptyArr = {false, false, false, false};//指定列可为空，不可为空值为false.
+
+        List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
+        Map<String, Object> fileMap = new HashMap<>();
+        String errormsg = null;
+        try {
+            errormsg = importService.importFile(file, fileType, request, titleArr, emptyArr, list, 3);
+
+            if (errormsg != null && !"".equals(errormsg)) {
+                fileMap.put("errormsg", errormsg);
+                return fileMap;
+            }
+
+            //查询代储点名称和代储库名称对应的id
+            Map<String, Object> agentMap = importService.temperData(file, fileType, request);
+
+            if (list.size() > 0) {
+                errormsg = temperImportService.importData(list, orgId, agentMap);
+            }
+        } catch (Exception e) {
+            fileMap.put("errormsg", TypeEnum.ED.getCode()+",请检查模板数据!");
+            e.printStackTrace();
+            return fileMap;
+        }
+        fileMap.put("errormsg", errormsg);
+        return fileMap;
+    }
+
+}

src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TemperImportMapper.java

@@ -0,0 +1,19 @@
+package com.chinaitop.depot.intelligent.grainsituation.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import java.util.Map;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2020-08-03 15:03
+ */
+@Repository
+public interface TemperImportMapper {
+    Map<String,Object> getNameId(Map<String, Object> agentMap);
+
+    Map<String,Object> getStorehouseId(Map<String, Object> enumData);
+
+    Map<String,Object> getWarehouseId(Map<String, Object> enumData);
+}

src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TemperImportMapper.xml

@@ -0,0 +1,67 @@
+<?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.chinaitop.depot.intelligent.grainsituation.mapper.TemperImportMapper" >
+    <select id="getNameId" parameterType="java.util.Map" resultType="java.util.HashMap">
+        SELECT
+        org_id depotid
+        FROM
+        org_info
+        WHERE org_name = #{depotName}
+    </select>
+    <select id="getEnumId" parameterType="java.util.Map" resultType="java.util.HashMap">
+        SELECT
+        enumId
+        FROM
+        basic_enum
+        WHERE
+        parentId = #{parentId}
+        AND enumName = #{enumName}
+    </select>
+    <select id="getEnumChildId" parameterType="java.util.Map" resultType="java.util.HashMap">
+        SELECT
+        enumId
+        FROM
+        basic_enum
+        WHERE
+        parentId = (
+        SELECT
+        enumId
+        FROM
+        basic_enum
+        WHERE
+        parentId = #{parentId}
+        AND gbCode = (
+        SELECT
+        substr(enumCode, 1, 1)
+        FROM
+        basic_enum
+        WHERE
+        parentId = #{parentId}
+        AND enumName = #{enumName}
+        )
+        )
+        AND enumName = #{enumName}
+    </select>
+    <select id="getStorehouseId" parameterType="java.util.Map" resultType="java.util.HashMap">
+        SELECT
+        storehouse_id storehouseid,
+        storehouse_code storehouse
+        FROM
+        basic_storehouse
+        WHERE del_flag = 1
+        AND depot_id = #{depotId}
+        AND storehouse_name = #{storehouseName}
+    </select>
+    <select id="getWarehouseId" parameterType="java.util.Map" resultType="java.util.HashMap">
+        SELECT
+        whouse.warehouse_id warehouseId,
+        warehouse_code house
+        FROM
+        basic_warehouse whouse
+        LEFT JOIN basic_storehouse shouse ON shouse.storehouse_id = whouse.storehouse_id
+        WHERE whouse.del_flag = 1
+        AND shouse.del_flag = 1
+        AND whouse.warehouse_name = #{warehouseName}
+        AND shouse.storehouse_id = #{storehouseId}
+    </select>
+</mapper>

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/TemperImportService.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.intelligent.grainsituation.service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2020-08-03 14:59
+ */
+public interface TemperImportService {
+    /**
+     * 导入
+     *
+     * @param list
+     * @param orgId
+     * @return
+     */
+    String importData(List<List<String>> list, Integer orgId, Map<String, Object> agentMap);
+}

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/TemperImportServiceImpl.java

@@ -0,0 +1,191 @@
+package com.chinaitop.depot.intelligent.grainsituation.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.intelligent.grainsituation.mapper.TemperImportMapper;
+import com.chinaitop.depot.intelligent.grainsituation.model.TTestdata;
+import com.chinaitop.depot.intelligent.grainsituation.service.TemperImportService;
+import com.chinaitop.depot.intelligent.pushs.service.GrainPushsService;
+import com.chinaitop.depot.intelligent.utils.DateUtils;
+import com.chinaitop.depot.intelligent.utils.ParameterUtil;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2020-08-03 15:00
+ */
+@Service
+public class TemperImportServiceImpl implements TemperImportService {
+    @Resource
+    private TemperImportMapper temperImportMapper;
+    @Resource
+    private GrainPushsService pushsService;
+
+    @Override
+    public String importData(List<List<String>> list, Integer orgId, Map<String, Object> agentMap) {
+        String msg = "";
+
+        TTestdata agentTemper = new TTestdata();
+        Map<String, Object> enumData = new HashMap<>();
+
+        Map<String, Object> agentsMap = temperImportMapper.getNameId(agentMap);
+        if (ParameterUtil.isnull(agentsMap) || ParameterUtil.isnull(agentsMap.get("depotid"))) {
+            msg = "粮库信息查询不到，请确认后再导入！";
+            return msg;
+        }
+
+        //仓房名称
+        enumData.put("storehouseName", agentMap.get("storehouseName"));
+        enumData.put("depotId", agentsMap.get("depotid"));
+        Map<String, Object> storehouseId = temperImportMapper.getStorehouseId(enumData);
+        if (ParameterUtil.isnull(storehouseId)) {
+            msg = "仓房信息查询不到，请确认后再导入！";
+            return msg;
+        }
+        //货位名称
+        enumData.put("warehouseName", agentMap.get("warehouseName"));
+        enumData.put("storehouseId", storehouseId.get("storehouseid"));
+        Map<String, Object> warehouseId = temperImportMapper.getWarehouseId(enumData);
+        if (ParameterUtil.isnull(warehouseId)) {
+            msg = "货位信息查询不到，请确认后再导入！";
+            return msg;
+        }
+        agentTemper.setStorehouse(storehouseId.get("storehouse").toString());
+        if (!(agentMap.get("houseTemperature") != null && agentMap.get("houseTemperature").toString().matches("^(-)?\\d+(.\\d{1,2})?$"))) { // 带1-2位小数的正数或负数
+            msg = "仓温输入值为字符！";
+            return msg;
+        }
+        agentTemper.setInh(new BigDecimal(agentMap.get("houseTemperature").toString()));
+        if (!(agentMap.get("houseHumidity") != null && agentMap.get("houseHumidity").toString().matches("^[0.0-9.0]+$"))) { // [0-9]没办法识别小数，[0.0-9.0]可以识别小数和整数
+            msg = "仓湿输入值为字符！";
+            return msg;
+        }
+        agentTemper.setOuttemp(new BigDecimal(agentMap.get("houseHumidity").toString()));
+        if (!(agentMap.get("gasTemperature") != null && agentMap.get("gasTemperature").toString().matches("^(-)?\\d+(.\\d{1,2})?$"))) { // 带1-2位小数的正数或负数
+            msg = "气温输入值为字符！";
+            return msg;
+        }
+        agentTemper.setOuth(new BigDecimal(agentMap.get("gasTemperature").toString()));
+        if (!(agentMap.get("gasHumidity") != null && agentMap.get("gasHumidity").toString().matches("^[0.0-9.0]+$"))) {
+            msg = "气湿输入值为字符！";
+            return msg;
+        }
+        // 格式化效验时间
+        String vDate = agentMap.get("detectionTime").toString();
+        if (StringUtils.isNotBlank(vDate)) {
+            if (!(DateUtils.dateStringInterval(vDate))) {
+                return "检测时间格式为(2020-08-08 10:52:13),其中:为英文符号！";
+            }
+        } else {
+            return "检测时间为空！";
+        }
+
+        Map<String, Object> pointMap = new HashMap<>();//一行温度数据
+        List<Map<String, Object>> pointList = new ArrayList<>();//温度集合数据
+
+        // mapList 数据封装
+        List<String> listMap = new ArrayList<>();
+        // 仓房信息map数据
+        Map<String, Object> houseMap = new HashMap<>();
+
+        houseMap.put("storehouse", storehouseId.get("storehouse"));
+        houseMap.put("house", warehouseId.get("house"));
+        // 处理时间
+        String string = agentMap.get("detectionTime").toString();
+        Date date = DateUtils.stringToData(string);
+        String s = DateUtils.formatDateYMDHMS(date);
+        houseMap.put("time", s);
+
+        houseMap.put("ilqYq", "0");
+        houseMap.put("intemp", agentMap.get("houseTemperature"));
+        houseMap.put("inh", agentMap.get("houseHumidity"));
+        houseMap.put("outtemp", agentMap.get("gasTemperature"));
+        houseMap.put("outh", agentMap.get("gasHumidity"));
+
+        Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+        // z值顺序效验容器
+        Integer zV = 1;
+        for (int i = 0; i < list.size(); i++) {
+            List<String> revList = list.get(i);
+            for (int j = 0; j < revList.size(); j++) {
+                switch (j) {
+                    case 0:
+                        //测温线缆行号(X)
+                        pointMap = new HashMap<>();
+                        if (!pattern.matcher(revList.get(j)).matches()) {
+                            msg = "行不是整数，请确认后再导入！";
+                            return msg;
+                        }
+                        pointMap.put("x", revList.get(j));
+                        break;
+                    case 1:
+                        //测温线缆列号(Y)
+                        pointMap.put("y", revList.get(j));
+                        if (!pattern.matcher(revList.get(j)).matches()) {
+                            msg = "列不是整数，请确认后再导入！";
+                            return msg;
+                        }
+                        break;
+                    case 2:
+                        //测温点高度(Z)
+                        pointMap.put("z", revList.get(j));
+                        if (!pattern.matcher(revList.get(j)).matches()) {
+                            msg = "高度不是整数，请确认后再导入！";
+                            return msg;
+                        }
+                        // z值顺序效验
+                        if (zV <= Integer.parseInt(revList.get(j))) {
+                            zV = Integer.parseInt(revList.get(j));
+                        } else {
+                            msg = "测温点高度(Z)，请顺序填写(1,1,1.2,2,2.3,3,3)！";
+                            return msg;
+                        }
+                        break;
+                    case 3:
+                        //温度值
+                        pointMap.put("temp", revList.get(j));
+                        break;
+                    default:
+                        break;
+                }
+            }
+            pointList.add(pointMap);
+        }
+        /*// 导入数据层倒叙重新赋值
+        // 计算层数
+        Map<Integer, List<Map<String, Object>>> z = pointList.stream().collect(Collectors.groupingBy(tem -> Integer.parseInt(tem.get("z").toString())));
+        Integer size = z.size();
+        // 初始比对计数器
+        int i1 = 1;
+        // 执行+1时机
+        int i = pointList.size() / size;
+        // 修改z层(倒叙)
+        for (Map<String, Object> pm : pointList) {
+            for (String k : pm.keySet()) {
+                if ("z".equals(k)) {
+                    pm.put(k, size.toString());
+                }
+            }
+            if (i1 == i) {
+                size--;
+            }
+            i1++;
+            if (i1 > i) {
+                i1 = 1;
+            }
+        }*/
+        houseMap.put("points", pointList); // 层温数据
+        listMap.add(JSONObject.toJSONString(houseMap));
+        String replace = listMap.toString().replace(" ", "");
+        pushsService.uploadGrainTemperatureData("source_ls", replace);
+        return msg;
+    }
+
+}

src/main/java/com/chinaitop/depot/intelligent/pushs/service/impl/GrainPushsServiceImpl.java

@@ -49,9 +49,6 @@ public class GrainPushsServiceImpl implements GrainPushsService {
     private TWarningThresholdHistoryMapper tWarningThresholdHistoryMapper;
 
     @Resource
-    private UuidUtils uuidUtils;
-
-    @Resource
     private WarningMessage warningMessage;
 
     @Resource
@@ -95,7 +92,8 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                 }
                 String orgId = temperatureRecordService.getOrgId(cDcsCodes.get(0));
                 ts.forEach(obj -> {
-                    String testdataId = uuidUtils.getCodeId(orgId, "t_testdata");
+                    String testdataId = UuidUtils.getCode();
+                    logger.info("testdataId: {}", testdataId);
                     TTestdata tTestdata = (TTestdata) obj;
                     String house = tTestdata.getStorehouse();
                     Date time = tTestdata.getTime();
@@ -141,7 +139,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                         BigDecimal wh = threshold.getThreshold();
                         //-1 小于 0 等于 1 大于
                         if (wholeMax.compareTo(wh) == 1 && !wholeMax.toString().equals("250.0") && ilqYq.equals("0")) {
-                            String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                            String tid = UuidUtils.getCode();
                             String desc = "整仓粮温(" + wholeMax + ")高于阈值(" + wh + ")";
                             TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, threshold, wholeMax, wh, time, desc, dataSource2, "0", "0");
                             tWarningThresholdHistorieList.add(tt);
@@ -152,7 +150,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                             BigDecimal ww = wWarning.getThreshold();
                             BigDecimal subtract = wh.subtract(ww).setScale(2, RoundingMode.HALF_UP); //高温减去阈值
                             if (wholeMax.compareTo(subtract) == 1 && ilqYq.equals("0")) {
-                                String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                                String tid = UuidUtils.getCode();
                                 String desc = "整仓粮温(" + wholeMax + ")高于阈值(" + subtract + ")";
                                 TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, wholeMax, subtract, time, desc, dataSource2, "0", "1");
                                 tWarningThresholdHistorieList.add(tt);
@@ -165,7 +163,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                         BigDecimal wl = wLowest.getThreshold().setScale(2, RoundingMode.HALF_UP);
                         //-1 小于 0 等于 1 大于
                         if (wMin.compareTo(wl) == -1 && !wMin.toString().equals("250.0") && ilqYq.equals("0")) {
-                            String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                            String tid = UuidUtils.getCode();
                             String desc = "整仓粮温(" + wMin + ")低于阈值(" + wl + ")";
                             TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wLowest, wMin, wl, time, desc, dataSource2, "0", "0");
                             tWarningThresholdHistorieList.add(tt);
@@ -176,7 +174,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                             BigDecimal ww = wWarning.getThreshold();
                             BigDecimal wadd = wl.add(ww);//高温减去阈值
                             if (wMin.compareTo(wadd) == -1 && ilqYq.equals("0")) {
-                                String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                                String tid = UuidUtils.getCode();
                                 String desc = "整仓粮温(" + wMin + ")低于阈值(" + wadd + ")";
                                 TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, wMin, wadd, time, desc, dataSource2, "0", "1");
                                 tWarningThresholdHistorieList.add(tt);
@@ -211,7 +209,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                         tTestdataLayer.setLmin(lsyerMin);
                         tTestdataLayer.setLhouse(house);
                         tTestdataLayer.setLtime(time);
-                        tTestdataLayer.setId(uuidUtils.getCodeId(orgId, "t_testdata_layer"));
+                        tTestdataLayer.setId(UuidUtils.getCode());
                         tTestdataLayer.setOrgId(orgId);
                         tTestdataLayer.setDataSource(dataSource2);
                         tTestdataLayer.setLqId(testdataId);
@@ -235,7 +233,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                                         //-1 小于 0 等于 1 大于
                                         if (te.compareTo(threshold1) == 1 && !te.toString().equals("250.0")) {
                                             // tid id,cfCdoe 仓房编码,threshold 报警实体包括orgID,tthreshold 检测值,wThreshold 预警或报警设置值,date 检测时间,desc 描述信息,mode 0测温，1测虫，2测气,warning 0报警，1预警
-                                            String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                                            String tid = UuidUtils.getCode();
                                             String desc = "第" + keyL + "层,第" + keyR + "行,第" + keyC + "列粮温(" + te + ")高于阈值(" + threshold1 + ")";
                                             TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, threshold, te, threshold1, time, desc, dataSource2, "0", "0");
                                             tWarningThresholdHistorieList.add(tt);
@@ -246,7 +244,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                                             BigDecimal ww = wWarning.getThreshold();
                                             BigDecimal subtract = threshold1.subtract(ww).setScale(2, RoundingMode.HALF_UP); //高温减去阈值
                                             if (te.compareTo(subtract) == 1 && ilqYq.equals("0")) {
-                                                String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                                                String tid = UuidUtils.getCode();
                                                 String desc = "第" + keyL + "层,第" + keyR + "行,第" + keyC + "列粮温(" + te + ")高于阈值(" + subtract + ")";
                                                 TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, te, subtract, time, desc, dataSource2, "0", "1");
                                                 tWarningThresholdHistorieList.add(tt);
@@ -258,7 +256,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                                         BigDecimal wl = wLowest.getThreshold().setScale(2, RoundingMode.HALF_UP);
                                         //-1 小于 0 等于 1 大于
                                         if (te.compareTo(wl) == -1 && !te.toString().equals("250.0")) {
-                                            String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                                            String tid = UuidUtils.getCode();
                                             String desc = "第" + keyL + "层,第" + keyR + "行,第" + keyC + "列粮温(" + te + ")低于阈值(" + wl + ")";
                                             TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wLowest, te, wl, time, desc, dataSource2, "0", "0");
                                             tWarningThresholdHistorieList.add(tt);
@@ -269,7 +267,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                                             BigDecimal ww = wWarning.getThreshold();
                                             BigDecimal wadd = wl.add(ww).setScale(2, RoundingMode.HALF_UP);//高温减去阈值
                                             if (te.compareTo(wadd) == -1 && ilqYq.equals("0")) {
-                                                String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                                                String tid = UuidUtils.getCode();
                                                 String desc = "第" + keyL + "层,第" + keyR + "行,第" + keyC + "列粮温(" + te + ")低于阈值(" + wadd + ")";
                                                 TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, te, wadd, time, desc, dataSource2, "0", "1");
                                                 tWarningThresholdHistorieList.add(tt);

src/main/java/com/chinaitop/depot/intelligent/utils/DateUtils.java

@@ -62,4 +62,40 @@ public class DateUtils {
         }
         return null;
     }
+
+    /**
+     * 用于效验粮温导入excel时间字符串效验
+     *
+     * @param str 时间字符串(yyyy-MM-dd HH:mm:ss)
+     * @return boolean
+     */
+    public static boolean dateStringInterval(String str) {
+        boolean flag = false; // 返回
+        str = str.trim(); // 去除时间首尾空格
+        int ymd = 0; // -符计数器
+        int hms = 0; // 英文:计数器
+        int ds = 0; // 日和小时中间空格计数器
+        // 效验时间
+        for (int i = 0; i < str.length(); i++) {
+            if (str.codePointAt(i) == 45) { // 英文字符-对应的是45,并查看有几个-
+                ymd++;
+            } else if (str.codePointAt(i) == 58) { // 英文字符:对应的是58,并查看有几个:
+                hms++;
+            } else if (str.codePointAt(i) == 32) { // 日和小时中间空格,空格对应32
+                ds++;
+            }
+        }
+        // 时间格式效验,规定格式(yyyy-MM-dd HH:mm:ss)
+        if (ymd == 2 && hms == 2 && ds == 1) { // 必须为(yyyy-MM-dd)两个-,和(HH:mm:ss) 两个英文:
+            flag = true;
+        }
+        return flag;
+    }
+
+    // 获取日期格式化
+    public static String formatDateYMDHMS(Date date) {
+        SimpleDateFormat dateTime = new SimpleDateFormat("yyyyMMddHHmmss");
+        return dateTime.format(date);
+    }
+
 }

src/main/java/com/chinaitop/depot/intelligent/utils/ExcelImportUtils.java

@@ -0,0 +1,48 @@
+package com.chinaitop.depot.intelligent.utils;
+
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+
+/**
+ * @auther mafy
+ * @createtime 2017/10/26 0026
+ */
+public class ExcelImportUtils {
+
+    //是否是2003的excel，返回true是2003
+    public static boolean isExcel2003(String filePath)  {
+        return filePath.matches("^.+\\.(?i)(xls)$");
+    }
+
+    //是否是2007的excel，返回true是2007
+    public static boolean isExcel2007(String filePath)  {
+        return filePath.matches("^.+\\.(?i)(xlsx)$");
+    }
+
+    /**
+     * 验证EXCEL文件
+     * @param filePath
+     * @return
+     */
+    public static boolean validateExcel(String filePath){
+        if (filePath == null || !(isExcel2003(filePath) || isExcel2007(filePath))){
+            return false;
+        }
+        return true;
+    }
+
+    public static boolean isEmpty(String type,int index,boolean[] NotEmpty){//判断是否可为空
+        return NotEmpty[index];
+    }
+
+    //判断导入的excel是否和模板相同
+    public  static boolean isSame(Row row, int totalCells,String[] titleArr){
+        for (int i = 0; i < totalCells; i++) {
+            Cell cell = row.getCell(i);//第一行的每一列
+            if(!ParameterUtil.isequal(cell.getStringCellValue(),titleArr[i]) || (totalCells != titleArr.length)){
+                return false;
+            }
+        }
+        return true;
+    }
+}

src/main/java/com/chinaitop/depot/intelligent/utils/ImportServiceImpl.java

@@ -0,0 +1,216 @@
+package com.chinaitop.depot.intelligent.utils;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @auther mafy
+ * @createtime 2017/10/26 0026
+ * 导入公共类，直接调用importFile方法即可
+ */
+@Service
+public class ImportServiceImpl {
+
+
+
+    public String importFile(MultipartFile file, String fileType, HttpServletRequest request, String[] titleArr, boolean[] emptyArr, List<List<String>> lists, Integer numLines) throws Exception{
+
+        // 服务器路径
+        String rootPath = request.getSession().getServletContext().getRealPath("");
+        // 文件相对路径
+        String relativePath = "/upload/" + fileType;
+        //创建临时文件
+        createTemp(file,rootPath,relativePath);
+        //读取临时文件，并且返回错误信息
+        String fileAllpath = rootPath+relativePath+"/"+file.getOriginalFilename();
+
+        String retVal = readExcelValue(fileAllpath,titleArr,emptyArr,lists,numLines);
+
+        return retVal;
+    }
+
+    /**
+     * 获取第一行的代储点名称和代储库名称
+     * @return
+     * @throws Exception
+     */
+    public Map<String, Object> nameData(MultipartFile file, String fileType, HttpServletRequest request) throws Exception{
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // 服务器路径
+        String rootPath = request.getSession().getServletContext().getRealPath("");
+        // 文件相对路径
+        String relativePath = "/upload/" + fileType;
+        //读取临时文件，并且返回错误信息
+        String fileAllpath = rootPath+relativePath+"/"+file.getOriginalFilename();
+        //获取File
+        File tempFile = new File(fileAllpath);
+        Row row = getWorkbook(tempFile,fileAllpath).getSheetAt(0).getRow(0);
+        //第一行第二列，第四列是名称
+        modelMap.put("agentName",row.getCell(1).toString());
+        modelMap.put("agentDepotName",row.getCell(3).toString());
+        //删除临时文件
+        if(tempFile.exists()){ tempFile.delete(); }
+        return modelMap;
+    }
+
+    /**
+     * 粮情信息数据
+     * @return
+     * @throws Exception
+     */
+    public Map<String, Object> temperData(MultipartFile file, String fileType, HttpServletRequest request) throws Exception{
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // 服务器路径
+        String rootPath = request.getSession().getServletContext().getRealPath("");
+        // 文件相对路径
+        String relativePath = "/upload/" + fileType;
+        //读取临时文件，并且返回错误信息
+        String fileAllpath = rootPath+relativePath+"/"+file.getOriginalFilename();
+        //获取File
+        File tempFile = new File(fileAllpath);
+        Row row = getWorkbook(tempFile,fileAllpath).getSheetAt(0).getRow(0);
+        //第一行第二列，第四列是名称
+        modelMap.put("depotName",row.getCell(1).toString());//粮库名称
+        modelMap.put("storehouseName",row.getCell(3).toString());//仓房名称
+        modelMap.put("warehouseName",row.getCell(5).toString());//货位名称
+
+        row = getWorkbook(tempFile,fileAllpath).getSheetAt(0).getRow(1);
+        modelMap.put("houseTemperature",row.getCell(1).toString());//仓温
+        modelMap.put("houseHumidity",row.getCell(3).toString());//仓湿
+        modelMap.put("gasTemperature",row.getCell(5).toString());//气温
+
+        row = getWorkbook(tempFile,fileAllpath).getSheetAt(0).getRow(2);
+        modelMap.put("gasHumidity",row.getCell(1).toString());//气湿
+        modelMap.put("detectionTime",row.getCell(3).toString());//检测时间
+
+        //删除临时文件
+        if(tempFile.exists()){ tempFile.delete(); }
+        return modelMap;
+    }
+
+    /**
+     * 创建临时文件
+     * @param file 上传过来的文件流
+     * @param rootPath 根目录
+     * @param relativePath 相对路径
+     * @throws Exception
+     */
+    public void createTemp(MultipartFile file, String rootPath, String relativePath) throws Exception{
+        // 如路径不存在，则创建它
+        File directory = new File(rootPath + relativePath);
+        if (!directory.exists()) {
+            directory.mkdirs();
+        }
+        String filePath = relativePath + "/" + file.getOriginalFilename();
+        // 复制 文件
+        file.transferTo(new File(rootPath + filePath));
+    }
+
+
+    /**
+     * 解析Excel里面的数据，目前只支持1个sheet
+     * @param fileName
+     * @return
+     */
+    public String readExcelValue(String fileName,String[] titleArr,boolean[] emptyArr,List<List<String>> list,Integer numLines){
+
+        //获取File
+        File tempFile = new File(fileName);
+
+        StringBuilder errorMSG = new StringBuilder("");//错误信息收集器
+        int sheetNum = 1;//sheet的总数
+        //循环每一个sheet
+        for (int i = 0; i < sheetNum; i++) {
+            String err = everySheet(getWorkbook(tempFile,fileName).getSheetAt(i),titleArr,emptyArr,list,numLines);
+            if(ParameterUtil.isnotnull(err)){
+                errorMSG.append("第"+(i+1)+"个sheet，名称为："+getWorkbook(tempFile,fileName).getSheetName(i)+"，错误信息："+err);
+            }
+        }
+
+        if(ParameterUtil.isequal(numLines,0)){
+            //删除临时文件
+            if(tempFile.exists()){ tempFile.delete(); }
+        }
+
+        return errorMSG.toString();
+    }
+
+
+    //获取workbook
+    private Workbook getWorkbook(File file , String FileName){
+        Workbook wb = null;
+        try {
+            InputStream is = new FileInputStream(file);
+            if(ExcelImportUtils.isExcel2007(FileName))
+                wb = new XSSFWorkbook(is);
+            else
+                wb = new HSSFWorkbook(is);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return wb;
+    }
+
+
+    //遍历每一个sheet，获取值和错误信息
+    private String  everySheet(Sheet sheet,String[] titleArr,boolean[] emptyArr,List<List<String>> list,Integer numLines){
+        String errorMsg = "", br = "<br/>";
+        //得到当前sheet的Excel的行数
+        int totalRows=sheet.getPhysicalNumberOfRows();
+        //总列数
+        int totalCells = 0;
+        //得到Excel的列数(前提是有行数)，从第二行算起
+        if(totalRows>=2 && sheet.getRow(1+numLines) != null){
+            totalCells=sheet.getRow(0+numLines).getPhysicalNumberOfCells();
+        }else{
+            return "请确认excel的数据";
+        }
+
+        if (!ExcelImportUtils.isSame(sheet.getRow(numLines),totalCells,titleArr)){ return "导入excel和模板不一致"; }//判断标题是否正确
+
+        //开始处理数据，循环Excel行数,从第二行开始。标题不入库
+        for(int r=(1+numLines);r<totalRows;r++){
+            List<String> rowList = new ArrayList<String>();
+            String rowMessage = "";
+            Row row = sheet.getRow(r);
+            if (row == null){
+                errorMsg += br+"第"+(r+1+numLines)+"行数据异常，请仔细检查！";
+                continue;
+            }
+
+            //循环Excel的列
+            for(int c = 0; c <totalCells; c++){
+                Cell cell = row.getCell(c);
+                if(cell == null){
+                    rowList.add("");
+                }else{
+                    cell.setCellType(Cell.CELL_TYPE_STRING);
+                    String cellVal = cell.getStringCellValue();
+                    if((StringUtils.isEmpty(cellVal) && !emptyArr[c])){
+                        errorMsg+=br+"第"+(r+1+numLines)+"行，第"+(c+1)+"列数据不可为空或者数据异常";
+                        rowList.add("error");
+                    }else{
+                        //正常数据处理
+                        rowList.add(cellVal);
+                    }
+                }
+                if(c == totalCells-1) list.add(rowList);//将每一行的数据添加到list中
+            }
+        }
+        return errorMsg;
+    }
+}

src/main/java/com/chinaitop/depot/intelligent/utils/VerificationSourceUtils.java

@@ -15,6 +15,7 @@ public class VerificationSourceUtils {
         Map<String, String> source = Maps.newHashMap();
         source.put("source_zkyh","1");
         source.put("source_zy","0");
+        source.put("source_ls","2"); // 历史数据导入
         return source;
     }
 

src/main/java/com/unissoft/serviceconfig/CxfConfig.java

@@ -14,10 +14,7 @@ import javax.xml.ws.Endpoint;
 
 @Configuration
 public class CxfConfig {
-    @Bean
-    public ServletRegistrationBean dispatcherServlet() {
-        return new ServletRegistrationBean(new CXFServlet(),"/intelligent/*");
-    }
+
     @Bean(name = Bus.DEFAULT_BUS_ID)
     public SpringBus springBus() {
         return new SpringBus();

src/main/resources/bootstrap.yml

@@ -1,10 +1,18 @@
 spring:
   profiles:
     active: clouda
+  servlet:
+    multipart:
+      #单个文件上传大小
+      max-file-size: 10MB
+      #总数上传大小
+      max-request-size: 20MB
 server:
   port: 9028
   tomcat:
     uri-encoding: utf-8
+cxf:
+  path: /intelligent
 ---
 # 注册中心配置 defaultZone: http://eureka-depot:9001/eureka/
 eureka: