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

chaunyi_opc/opc_common/src/main/java/com/example/opc_common/entity/ReportTable.java

@@ -78,12 +78,13 @@ public class ReportTable extends BaseSchedule implements Serializable {
 
     public ReportTable(Integer reportTableType, Integer tableTemplateId,
                        String userId, String reportTableName, String reportTableData,
-                       Integer version) {
+                       Integer version,Date createTime) {
         this.reportTableType = reportTableType;
         this.tableTemplateId = tableTemplateId;
         this.userId = userId;
         this.reportTableName = reportTableName;
         this.reportTableData = reportTableData;
         this.version = version;
+        this.createTime = createTime;
     }
 }

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/config/InitRunner.java

@@ -56,20 +56,22 @@ public class InitRunner {
         if (Blank.isNotEmpty(itemGroupIdList)) {
             for (Integer itemGroupId : itemGroupIdList) {
                 ItemGroup itemGroup = itemGroupDao.getItemGroupById(itemGroupId);
-                if (itemGroup.getReadMode().equals(ConstantStr.EXCEED_SET_VALUE)) {
-                    Integer dataSourceId = itemGroup.getDataSourceId();
-                    List<Item> itemList = itemGroupDao.getItemListByGroupId(itemGroupId);
-                    Long dataIndex = itemGroupDao.getMaxIndex(itemGroupId, dataSourceId);
-                    if (Blank.isNotEmpty(dataIndex)) {
-                        opcAsyncTask.packageEventTable(itemList, dataSourceId, dataIndex);
-                    }
-                } else {
-                    List<String> belongTimeList = rawDataDao.getRawDataBelongTime(itemGroupId);
-                    if (Blank.isNotEmpty(belongTimeList)) {
-                        for (int i = 0; i < belongTimeList.size(); i++) {
-                            List<Item> itemList = itemGroupDao.getItemListByGroupId(itemGroupId);
-                            Integer dataSourceId = itemGroup.getDataSourceId();
-                            opcAsyncTask.packageRawDataList1(itemList, dataSourceId, belongTimeList.get(i));
+                if(Blank.isNotEmpty(itemGroup)){
+                    if (itemGroup.getReadMode().equals(ConstantStr.EXCEED_SET_VALUE)) {
+                        Integer dataSourceId = itemGroup.getDataSourceId();
+                        List<Item> itemList = itemGroupDao.getItemListByGroupId(itemGroupId);
+                        Long dataIndex = itemGroupDao.getMaxIndex(itemGroupId, dataSourceId);
+                        if (Blank.isNotEmpty(dataIndex)) {
+                            opcAsyncTask.packageEventTable(itemList, dataSourceId, dataIndex);
+                        }
+                    } else {
+                        List<String> belongTimeList = rawDataDao.getRawDataBelongTime(itemGroupId);
+                        if (Blank.isNotEmpty(belongTimeList)) {
+                            for (int i = 0; i < belongTimeList.size(); i++) {
+                                List<Item> itemList = itemGroupDao.getItemListByGroupId(itemGroupId);
+                                Integer dataSourceId = itemGroup.getDataSourceId();
+                                opcAsyncTask.packageRawDataList1(itemList, dataSourceId, belongTimeList.get(i));
+                            }
                         }
                     }
                 }

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/dao/DataModelDao.java

@@ -26,5 +26,9 @@ public interface DataModelDao {
 
     List<DataModel> getDmListByItemList(List<Item> itemList);
 
-    List<Map<String,Object>> getItemGroupByDm(Integer id);
+    List<Map<String, Object>> getItemGroupByDm(Integer id);
+
+    DataModel getDataModelByRemark(String userId, String remark);
+
+    DataModel getDataModelByRemarkNoId(Integer id, String userId, String remark);
 }

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/service/impl/DataModelServiceImpl.java

@@ -32,6 +32,11 @@ public class DataModelServiceImpl implements DataModelService {
     @Override
     public synchronized Result addDataModel(DataModel dataModel) {
         String userId = userUtil.getCurrentUserId();
+        String remark = dataModel.getRemark();
+        DataModel exitDataModel = dataModelDao.getDataModelByRemark(userId, remark);
+        if (Blank.isNotEmpty(exitDataModel)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "已经存在此名称的数据模型了，请修改名称");
+        }
         dataModel.setUserId(userId);
         if (dataModelDao.addDataModel(dataModel) <= 0) {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "添加数据模型失败");
@@ -41,6 +46,13 @@ public class DataModelServiceImpl implements DataModelService {
 
     @Override
     public synchronized Result updateDataModel(DataModel dataModel) {
+        Integer id = dataModel.getId();
+        String userId = userUtil.getCurrentUserId();
+        String remark = dataModel.getRemark();
+        DataModel exitDataModel = dataModelDao.getDataModelByRemarkNoId(id, userId, remark);
+        if (Blank.isNotEmpty(exitDataModel)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "已经存在此名称的数据模型了，请修改名称");
+        }
         if (dataModelDao.updateDataModel(dataModel) <= 0) {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改数据模型失败");
         }

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcAsyncTask.java

@@ -731,10 +731,11 @@ public class OpcAsyncTask {
         }
         jsonObject.put("eventTables", objects);
         ItemGroup itemGroup = itemGroupDao.getItemGroupById(itemList.get(0).getItemGroupId());
+        Date date = new Date();
         ReportTable reportTable1 = new ReportTable(
                 ConstantStr.EVENT_GENERATE_REPORT, reportTable.getTableTemplateId(), reportTable.getUserId(),
-                reportTable.getReportTableName() + "_" + (Blank.isNotEmpty(itemGroup) ? itemGroup.getGroupName() : "") + "_" + DateUtil.dateChangeStr(new Date(), "yyyyMMddHHmmss"),
-                jsonObject.toJSONString(), reportTable.getVersion()
+                reportTable.getReportTableName() + "_" + (Blank.isNotEmpty(itemGroup) ? itemGroup.getGroupName() : "") + "_" + DateUtil.dateChangeStr(date, "yyyyMMddHHmmss"),
+                jsonObject.toJSONString(), reportTable.getVersion(), date
         );
         reportTableDao.addReportTable(reportTable1);
         reportTableDao.addTableAutoLog(new TableAutoLog(reportTable.getId(), reportTable1.getId()));

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/ReportTableTask.java

@@ -50,7 +50,7 @@ public class ReportTableTask {
         if (Blank.isNotEmpty(tableTemplateItemList)) {
             for (TableTemplateItem t : tableTemplateItemList) {
                 Integer itemGroupId = t.getItemGroupId();
-                if (Blank.isEmpty(itemGroupId)){
+                if (Blank.isEmpty(itemGroupId)) {
                     continue;
                 }
                 Integer remainder = itemGroupId % ConstantStr.SUB_TABLE_NUM;
@@ -160,10 +160,11 @@ public class ReportTableTask {
             log.info("报表模板不存在");
         }
         List<TableTemplateItem> tableTemplateItemList = reportTableDao.getTtiDataByTemplateId(tableTemplateId);
+        Date date = new Date();
         ReportTable reportTable1 = new ReportTable(
                 ConstantStr.AUTOMATIC_GENERATE_REPORT, tableTemplateId, reportTable.getUserId(),
-                reportTable.getReportTableName() + "_" + DateUtil.dateChangeStr(new Date(), "yyyyMMddHHmmss"),
-                reportTableData, reportTable.getVersion()
+                reportTable.getReportTableName() + "_" + DateUtil.dateChangeStr(date, "yyyyMMddHHmmss"),
+                reportTableData, reportTable.getVersion(), date
         );
         reportTableDao.addReportTable(reportTable1);
         reportTableDao.addTableAutoLog(new TableAutoLog(
@@ -173,7 +174,6 @@ public class ReportTableTask {
             reportTableDao.addTableUserGroup(reportTable1.getId(), reportTable.getUserGroupList());
         }
         //加载相应的数据
-        Date date = new Date();
         String cron = reportTable.getCron();
         Date startTime = CronUtil.getTimeBeforeTwo(cron, date);
         Date endTime = CronUtil.getTimeBefore(cron, date);
@@ -181,7 +181,7 @@ public class ReportTableTask {
         if (Blank.isNotEmpty(tableTemplateItemList)) {
             for (TableTemplateItem t : tableTemplateItemList) {
                 Integer itemGroupId = t.getItemGroupId();
-                if (Blank.isEmpty(itemGroupId)){
+                if (Blank.isEmpty(itemGroupId)) {
                     continue;
                 }
                 Integer remainder = itemGroupId % ConstantStr.SUB_TABLE_NUM;

chaunyi_opc/opc_da/src/main/resources/mapper/DataModelDao.xml

@@ -83,4 +83,21 @@
             ti.item_group_id;
     </select>
 
-</mapper>
+    <select id="getDataModelByRemark" resultType="com.example.opc_common.entity.DataModel">
+        select
+        <include refid="dataModel"/>
+        from t_data_model
+        where user_id = #{userId}
+        and remark=#{remark}
+    </select>
+
+    <select id="getDataModelByRemarkNoId" resultType="com.example.opc_common.entity.DataModel">
+        select
+        <include refid="dataModel"/>
+        from t_data_model
+        where user_id = #{userId}
+        and remark=#{remark}
+        and id !=#{id}
+    </select>
+
+</mapper>