提交NGN工作票数据

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/factory/DZMTSJServiceImpl.java

@@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.ParseException;
 import java.time.LocalDate;
@@ -50,6 +51,7 @@ public class DZMTSJServiceImpl implements IJXDZService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List buildData(Integer accessType, Long dateTime) {
         List<StationDailyDataVO> list = new ArrayList<>();
         if (JXDZAccessTypeEnum.BULU.getCode().equals(accessType)) {
@@ -80,14 +82,14 @@ public class DZMTSJServiceImpl implements IJXDZService {
         stationDailyDataVO.setName(name);
         stationDailyDataVO.setWorkTicketTotalNums(jxdzMapper.countWorkTicketTotalByCode(code).doubleValue());
         stationDailyDataVO.setWorkTicketProcessingNums(jxdzMapper.countWorkTicketProcessingByCode(code).doubleValue());
-        stationDailyDataVO.setWorkTicketInvalidatedNums(jxdzMapper.countWorkOrderInvalidatedByCode(code).doubleValue());
-        stationDailyDataVO.setWorkTicketExecutingNums(jxdzMapper.countWorkTicketInvalidatedByCode(code).doubleValue());
+        stationDailyDataVO.setWorkTicketInvalidatedNums(jxdzMapper.countWorkTicketInvalidatedByCode(code).doubleValue());
+        stationDailyDataVO.setWorkTicketExecutingNums(Double.valueOf(0));
         stationDailyDataVO.setWorkTicketTerminatedNums(jxdzMapper.countWorkTicketTerminatedByCode(code).doubleValue());
         stationDailyDataVO.setRegularTasksNums(jxdzMapper.countRegularTasksByCode(code).doubleValue());
         stationDailyDataVO.setInspectionTasksNums(jxdzMapper.countInspectionTasksByCode(code).doubleValue());
         stationDailyDataVO.setWorkOrderTotalNums(jxdzMapper.countWorkOrderTotalByCode(code).doubleValue());
-        stationDailyDataVO.setWorkOrderInvalidatedNums(jxdzMapper.countWorkOrderToBeOpenedByCode(code).doubleValue());
-        stationDailyDataVO.setWorkOrderToBeOpenedNums(jxdzMapper.countWorkOrderTotalByCode(code).doubleValue());
+        stationDailyDataVO.setWorkOrderInvalidatedNums(jxdzMapper.countWorkOrderInvalidatedByCode(code).doubleValue());
+        stationDailyDataVO.setWorkOrderToBeOpenedNums(jxdzMapper.countWorkOrderToBeOpenedByCode(code).doubleValue());
         stationDailyDataVO.setWorkOrderTerminatedNums(jxdzMapper.countWorkOrderTerminatedByCode(code).doubleValue());
         stationDailyDataVO.setWorkOrderStartNums(jxdzMapper.countWorkOrderStartByCode(code).doubleValue());
         //调用core 接口

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application-dev1.properties

@@ -169,7 +169,10 @@ jxdzTokenUserName=jiangxi_epc
 jxdzTokenPassword=123456
 jxdzPublicKey=04508e9c4df8463c784df2dde2536e792851a8f3fd0e5ff29b7bf1a5d9e3f566aa49a7a5fe7683e3dc4dc30dd7bc8773838a9e4fbcf7dfac53461c8777a6aed691
 jxdzScheduledEnable=false
-
+amos.system.user.user-name=hygf_robot
+amos.system.user.password=a123456789
+amos.system.user.app-key=AMOS_STUDIO
+amos.system.user.product=AMOS_STUDIO_WEB
 
 
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/JXDZMapper.xml

@@ -9,15 +9,15 @@
 
     <select id="countWorkTicketProcessingByCode" resultType="java.lang.Integer">
         select COUNT(1) from yxgl_gzp_main where WERKS=#{code} and ZSTAT in
-        ('01','02','03','04','05','06','07','08','09','10','11','12','15','17','20','21','22','23','24','25','26','27','28','29','30','31','32','33')
+        ('01','02','03','04','05','06','07','08','09','10','11','12','15','16','17','20','21','22','23','24','25','26','27','28','29','30','31','32','33')
     </select>
 
     <select id="countWorkTicketInvalidatedByCode" resultType="java.lang.Integer">
-        select COUNT(1) from yxgl_gzp_main where WERKS=#{code} and ZSTAT ='19'
+        select COUNT(1) from yxgl_gzp_main where WERKS=#{code} and ZSTAT in ('19','18')
     </select>
 
     <select id="countWorkTicketTerminatedByCode" resultType="java.lang.Integer">
-        select COUNT(1) from yxgl_gzp_main where WERKS=#{code} and ZSTAT ='13'
+        select COUNT(1) from yxgl_gzp_main where WERKS=#{code} and ZSTAT in ('13','14')
     </select>
 
     <select id="countRegularTasksByCode" resultType="java.lang.Integer">