Merge branch 'master' of http://116.63.33.55/git/read_opc

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/controller/ReportTableController.java

@@ -134,6 +134,21 @@ public class ReportTableController {
     }
 
     /**
+     * 通过id获取报表模板,没有data
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/getTableTemplateNoDataById/{id}")
+//    @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.TABLETEMPLATE, OperationEnum = OperationEnum.SELECT)
+    public Result getTableTemplateNoDataById(@PathVariable Integer id) {
+        if (Blank.isEmpty(id)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return reportTableService.getTableTemplateNoDataById(id);
+    }
+
+    /**
      * 删除报表模板
      *
      * @param id

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/service/ReportTableService.java

@@ -16,6 +16,8 @@ public interface ReportTableService {
 
     Result getTableTemplateById(Integer id);
 
+    Result getTableTemplateNoDataById(Integer id);
+
     Result delTableTemplateById(Integer id, Integer isDelete);
 
     Result updateTableTemplate(TableTemplate tableTemplate);

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/service/impl/ReportTableServiceImpl.java

@@ -199,6 +199,11 @@ public class ReportTableServiceImpl implements ReportTableService {
     }
 
     @Override
+    public Result getTableTemplateNoDataById(Integer id) {
+        return Result.ok(reportTableDao.getTableTemplateNoDataById(id));
+    }
+
+    @Override
     public Result delTableTemplateById(Integer id, Integer isDelete) {
         Boolean flag = false;
         if (Blank.isNotEmpty(isDelete) && isDelete == 1) {

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/task/OpcDaFrequencyTask.java

@@ -102,6 +102,7 @@ public class OpcDaFrequencyTask extends TimerTask {
     public void run() {
         Integer id = itemGroup.getId();
         Integer dataSourceId = dataSource.getId();
+        itemGroupDao.stopItemGroupById(id, ConstantStr.START_UP);
         Server server = OpcDaUtil.createServer(dataSource);
         Long index = 0L;
         AutoReconnectController autoReconnectController = new AutoReconnectController(server);
@@ -191,6 +192,7 @@ public class OpcDaFrequencyTask extends TimerTask {
                 }
                 itemGroupDao.stopItemGroupById(itemGroup.getId(), ConstantStr.STOP_IT);
                 cronTaskRegister.removeCronTask(cronId);
+                redisUtil.del(ConstantStr.ITEM_GROUP + id);
                 timer.cancel();
             }
         }
@@ -230,6 +232,7 @@ public class OpcDaFrequencyTask extends TimerTask {
                             autoReconnectController.removeListener(listener);
                             autoReconnectController.disconnect();
                         }
+                        itemGroupDao.stopItemGroupById(itemGroup.getId(), ConstantStr.STOP_IT);
                         cronTaskRegister.removeCronTask(cronId);
                         redisUtil.del(ConstantStr.ITEM_GROUP + id);
                         timer.cancel();
@@ -416,6 +419,7 @@ public class OpcDaFrequencyTask extends TimerTask {
                             }
                             itemGroupDao.stopItemGroupById(itemGroup.getId(), ConstantStr.STOP_IT);
                             cronTaskRegister.removeCronTask(cronId);
+                            redisUtil.del(ConstantStr.ITEM_GROUP + id);
                             timer.cancel();
                             break;
                         }