上传工序选项接口代码

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineLogsService.java

@@ -1,10 +1,13 @@
 package com.iamberry.rst.faces.pts;
 
+import com.iamberry.rst.core.pts.PtsMachineLogs;
+
 /**
  * 机器生产日志service
  * Created by LJK on 2017/8/29.
  */
 public interface MachineLogsService {
-
+    //添加生产日志
+    Integer addMachineLogs(PtsMachineLogs ptsMachineLogs);
 
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineLogsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.iamberry.rst.service.pts;
 
+import com.iamberry.rst.core.pts.PtsMachineLogs;
 import com.iamberry.rst.faces.pts.DeviceService;
 import com.iamberry.rst.faces.pts.MachineLogsService;
 import com.iamberry.rst.service.pts.mapper.DeviceMapper;
@@ -18,4 +19,8 @@ public class MachineLogsServiceImpl implements MachineLogsService {
     @Autowired
     private MachineLogsMapper machineLogsMapper;
 
+    @Override
+    public Integer addMachineLogs(PtsMachineLogs ptsMachineLogs) {
+        return machineLogsMapper.addMachineLogs(ptsMachineLogs);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/MachineLogsMapper.java

@@ -1,9 +1,12 @@
 package com.iamberry.rst.service.pts.mapper;
 
+import com.iamberry.rst.core.pts.PtsMachineLogs;
+
 /**
  * 机器生产流程日志管理
  * Created by LJK on 2017/8/29.
  */
 public interface MachineLogsMapper {
-
+        //添加生产日志
+        Integer addMachineLogs(PtsMachineLogs ptsMachineLogs);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineLogsMapper.xml

@@ -1,6 +1,19 @@
 <?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.iamberry.rst.service.pts.mapper.MachineLogsMapper">
-
+    <insert id="addMachineLogs" parameterType="PtsMachineLogs" useGeneratedKeys="true" keyProperty="machineId">
+        INSERT INTO tb_rst_machine_logs
+        (machine_id,employee_id,produce_id,
+        process_id,device_id,employee_name,
+        produce_name,process_name,device_name
+        ,logs_process_status,logs_error_type,
+        logs_process_prompt,logs_process_time,
+        logs_create_time)
+        VALUES
+        (#{machineId},#{employeeId},#{produceId},
+        #{processId},#{deviceId},#{employeeName},#{produceName},
+        #{processName},#{deviceName},#{logsProcessStatus},#{logsErrorType}
+        ,#{logsProcessPrompt},#{logsProcessTime},#{logsCreateTime})
+    </insert>
 
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml

@@ -144,7 +144,7 @@
         process_id AS processId,
         node_no AS  nodeNo,
         node_status AS nodeStatus,
-        node_desc AS  nodeDesc,
+        node_des AS  nodeDes,
         node_create_time AS nodeCreateTime,
         node_update_time AS nodeUpdateTime
         FROM

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

@@ -1,12 +1,12 @@
 package com.iamberry.rst.controllers.pts;
 
-import com.alibaba.dubbo.common.json.JSON;
 import com.iamberry.rst.core.pts.*;
 import com.iamberry.rst.core.tools.QRCJson;
 import com.iamberry.rst.core.tools.WeixinUtil;
 import com.iamberry.rst.faces.pts.MachineService;
 import com.iamberry.rst.faces.pts.ProduceService;
 import com.iamberry.rst.service.pts.mapper.DeviceMapper;
+import com.iamberry.rst.service.pts.mapper.MachineLogsMapper;
 import com.iamberry.rst.service.pts.mapper.PtsEmployeeMapper;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResponseJson;
@@ -17,12 +17,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.Map;
 
 /**
  * Created by LJK on 2017/8/29.
@@ -42,6 +41,9 @@ public class MachineController {
     @Autowired
     private PtsEmployeeMapper ptsEmployeeMapper;
 
+    @Autowired
+    private MachineLogsMapper machineLogsMapper;
+    @ResponseBody
     @RequestMapping("/uploadProcessOptions")
     public ResponseJson uploadProcessOptions(HttpServletRequest request,@RequestBody JSONObject query){
         ResponseJson rj = new ResponseJson();
@@ -70,7 +72,7 @@ public class MachineController {
         }
         JSONArray nodes = query.getJSONArray("nodes");//选项集合（包含一个或多个工序选项，详情见示例）
         Iterator<Object> it = nodes.iterator();
-        for(int i = 0;i<= nodes.size();i++){
+        for(int i = 0;i< nodes.size();i++){
             JSONObject jsonObject = nodes.getJSONObject(i);
             /*JSONObject jsonObject = (JSONObject) it.next();*/
             /*System.out.println(jsonObject.toString());*/
@@ -97,9 +99,11 @@ public class MachineController {
             ptsMachineLogs.setLogsProcessPrompt(processNode.getNodeStatus() == 0?"异常操作": null);
             ptsMachineLogs.setLogsProcessTime(logsProcessDate);
             ptsMachineLogs.setLogsCreateTime(new Date());
+            machineLogsMapper.addMachineLogs(ptsMachineLogs);
             //根据下一条工序选项信息判断当前工序是否正常
-            JSONObject jsonObject2 = nodes.getJSONObject(i+1);
-            if(jsonObject2 != null){
+            if(i+1 < nodes.size()){
+                JSONObject jsonObject2 = nodes.getJSONObject(i+1);
+                if(jsonObject2 != null){
                     Integer processId2 = jsonObject.getInt("processId");
                     ProduceProcess produceProcess2 = produceService.getProduceProcess(processId2);
                     if(produceProcess2.getProcessSort() - produceProcess.getProcessSort() != 1){
@@ -108,6 +112,7 @@ public class MachineController {
                         ptsMachine2.setMachineProcessState(2);//2表示机器生产过程中出现异常
                         ptsMachine2.setMachineUpdateTime(new Date());
                     }
+                }
             }
         }
         //截取条形码尾号（4位）

watero-rst-web/src/main/resources/platform.properties

@@ -3,7 +3,7 @@ efast_base_url=http://121.199.165.244/efast_test/efast_api/webservice/web/index.
 app_nick=openapi
 app_key=8888
 app_secret=8888
-# sd_id ����id		test:001		watero:8
+# sd_id \uFFFD\uFFFD\uFFFD\uFFFDid		test:001		watero:8
 sd_id=001
 #---efast end---#
 #---SMS begin---#
@@ -22,12 +22,27 @@ cdnUrl=http://cms.iamberry.com/cdn
 base_url=http://app.iamberry.com/imberry
 INTER_SMS_URL=https://sms.yunpian.com/v2/sms/single_send.json
 INTER_SMS_KEY=2d3cc4afa42ec747b43a09ab89151133
-#确认短信
+#\u786E\u8BA4\u77ED\u4FE1
 CONFIRM_TEXT=\u3010\u7231\u8D1D\u6E90RST\u3011\u60A8\u6709{0}\u6761\u8BA2\u5355\u5F85\u5BA1\u6838\uFF0C\u8BF7\u5C3D\u5FEB\u524D\u5F80\u5904\u7406\uFF01
-#驳回短信
+#\u9A73\u56DE\u77ED\u4FE1
 REJECTED_TEXT=\u3010\u7231\u8D1D\u6E90RST\u3011\u60A8\u6709{0}\u6761\u8BA2\u5355\u88AB\u9A73\u56DE\uFF0C\u8BF7\u5C3D\u5FEB\u524D\u5F80\u5904\u7406\uFF01
-#通过短信
+#\u901A\u8FC7\u77ED\u4FE1
 THROUGH_TEXT=\u3010\u7231\u8D1D\u6E90RST\u3011\u60A8\u6709{0}\u6761\u8BA2\u5355\u5DF2\u5BA1\u6838\u901A\u8FC7\uFF01
-#通知发货短信
+#\u901A\u77E5\u53D1\u8D27\u77ED\u4FE1
 DELIVERY_TEXT=\u3010\u7231\u8D1D\u6E90RST\u3011\u60A8\u67091\u4E2A\u5730\u63A8\u8BA2\u5355\u5F85\u53D1\u8D27\uFF0C\u8BF7\u53CA\u65F6\u5904\u7406\u3002
-#---SMS end---#
+#---SMS end---#
+#weixin
+# pubNo
+pubNo=gh_c73446c8ce91
+# appId-test
+appId=wxc71b789fad06a2d7
+# appId-watero
+#appId=wx27c9f825761a861b
+# token
+token=weixin
+# appSecret-test
+appSecret=8a90e3ab0e2db7772f5f64e7ed2f4b98
+# appSecret-watero
+#appSecret=97b2f2991e4ff0f2567fbc625f858377
+# partnerkey
+partnerkey=cdb9075e7ecad945ba788bc5aedM212B