Merge remote-tracking branch 'origin/master'

chaunyi_opc/opc_common/src/main/java/com/example/opc_common/enums/ModelEnum.java

@@ -9,6 +9,7 @@ public enum ModelEnum {
 
     RUNNING("运行", "RUNNING"),
     DATASOURCE("数据源配置", "DATASOURCE"),
+    DATADRIVER("数据驱动配置", "DATADRIVER"),
     TABLETEMPLATE("报表模板", "TABLETEMPLATE"),
     REPORTTABLE("报表", "TABLETEMPLATE"),
     DATAGROUP("数据组配置", "DATAGROUP"),

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/controller/DataSourceController.java

@@ -161,7 +161,7 @@ public class DataSourceController {
      * @return
      */
     @PostMapping("/addDataSourceDriver")
-    @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.DATASOURCE, OperationEnum = OperationEnum.ADD)
+    @WebLog(ServerEnum = ServerEnum.SERVER, ModelEnum = ModelEnum.DATADRIVER, OperationEnum = OperationEnum.ADD)
     public Result addDataSourceDriver(@RequestBody DataSourceDriver dataSourceDriver) {
         if (Blank.isEmpty(dataSourceDriver, dataSourceDriver.getDriverName(), dataSourceDriver.getClsId())) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "数据源驱动名称、驱动不能为空");
@@ -176,7 +176,7 @@ public class DataSourceController {
      * @return
      */
     @PostMapping("/updateDataSourceDriver")
-    @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.DATASOURCE, OperationEnum = OperationEnum.UPDATE)
+    @WebLog(ServerEnum = ServerEnum.SERVER, ModelEnum = ModelEnum.DATADRIVER, OperationEnum = OperationEnum.UPDATE)
     public Result updateDataSourceDriver(@RequestBody DataSourceDriver dataSourceDriver) {
         if (Blank.isEmpty(dataSourceDriver, dataSourceDriver.getId(), dataSourceDriver.getDriverName(), dataSourceDriver.getClsId())) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "数据源id、驱动名称、驱动不能为空");
@@ -215,6 +215,7 @@ public class DataSourceController {
      * @return
      */
     @PostMapping("/delDataSourceDriver")
+    @WebLog(ServerEnum = ServerEnum.SERVER, ModelEnum = ModelEnum.DATADRIVER, OperationEnum = OperationEnum.DELETE)
     public Result delDataSourceDriver(Integer id) {
         if (Blank.isEmpty(id)) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "id不能为空");

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

@@ -51,7 +51,7 @@ public class ChartServiceImpl implements ChartService {
         List<ChartItem> chartItemList = chart.getChartItemList();
         if (Blank.isNotEmpty(chartItemList)) {
             String chartType = chart.getChartType();
-            if (chartType.equals(ConstantStr.BAR_CHART)) {
+            if (chartType.equals(ConstantStr.PIE_CHART)) {
                 if (chartItemList.size() != 1) {
                     return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "饼状图只能配置一个数据项");
                 }
@@ -76,7 +76,7 @@ public class ChartServiceImpl implements ChartService {
         List<ChartItem> chartItemList = chart.getChartItemList();
         if (Blank.isNotEmpty(chartItemList)) {
             String chartType = chart.getChartType();
-            if (chartType.equals(ConstantStr.BAR_CHART)) {
+            if (chartType.equals(ConstantStr.PIE_CHART)) {
                 if (chartItemList.size() != 1) {
                     return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "饼状图只能配置一个数据项");
                 }