新增地区信息Controller

优化管控记录类型判断

zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java

@@ -444,6 +444,7 @@ public class DcDeviceController extends BaseController {
             @PathVariable String deviceId,
             @PathVariable String functionId,
             @RequestBody HashMap<String, Object> props) throws HttpException, IOException {
+    //public AjaxResult invokedFunction(@PathVariable String deviceId,@PathVariable String functionId,@RequestBody HashMap<String, Object> props,int operType) throws HttpException, IOException { todo
 
         return getAjaxResult(deviceId, functionId, props);
 
@@ -481,6 +482,7 @@ public class DcDeviceController extends BaseController {
     @ApiOperation("批量设备功能调用")
     @PostMapping("/batchFunctions")
     @OperationLog(operUrl = "/business/device/batchFunctions")
+    //public AjaxResult batchInvokedFunction(@RequestBody Map<String, Object> props,int operType) throws HttpException, IOException, InterruptedException { todo
     public AjaxResult batchInvokedFunction(@RequestBody Map<String, Object> props) throws HttpException, IOException, InterruptedException {
         ArrayList<JSONObject> devices = (ArrayList<JSONObject>) props.get("devices");
         ArrayList<JSONObject> functions = (ArrayList<JSONObject>) props.get("functions");
@@ -613,6 +615,7 @@ public class DcDeviceController extends BaseController {
 
     @OperationLog(operUrl = "/business/device/batchFunctions")
     public AjaxResult batchInvokedFunction(Object object) throws HttpException, IOException, InterruptedException {
+    //public AjaxResult batchInvokedFunction(Object object,int operType) throws HttpException, IOException, InterruptedException { todo
         Map<String, Object> map = new ObjectMapper().convertValue(object, Map.class);
         return batchInvokedFunction(map);
     }

zc-business/src/main/java/com/zc/business/controller/DcRegionController.java

@@ -0,0 +1,118 @@
+package com.zc.business.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.zc.business.domain.DcRegion;
+import com.zc.business.service.impl.DcRegionServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 地区信息Controller
+ *
+ * @author zhaoxianglong
+ */
+@Api(tags = {"地区信息"})
+@RestController
+@RequestMapping("/business/region")
+public class DcRegionController extends BaseController {
+    @Resource
+    private DcRegionServiceImpl dcRegionService;
+
+    //*********************************道路增删改查******************************************
+
+    /**
+     * 分页查询道路列表
+     *
+     * @param dcRegion 请求参数
+     * @return 分页查询结果
+     */
+    @ApiOperation("分页查询道路列表")
+    @PreAuthorize("@ss.hasPermi('iot:road:list')")
+    @GetMapping("list")
+    public TableDataInfo listRoad(DcRegion dcRegion) {
+        return getDataTable(dcRegionService.list());
+    }
+
+    /**
+     * 无分页查询道路列表
+     *
+     * @param dcRegion 请求参数
+     * @return 查询结果
+     */
+    @ApiOperation("无分页查询道路列表")
+    @PreAuthorize("@ss.hasPermi('iot:road:query')")
+    @GetMapping("query")
+    public AjaxResult queryRoad(DcRegion dcRegion) {
+        return AjaxResult.success(dcRegionService.list());
+    }
+
+    /**
+     * 根据id查询道路信息
+     *
+     * @param id id
+     * @return 查询结果
+     */
+    @ApiOperation("根据id查询道路信息")
+    @PreAuthorize("@ss.hasPermi('iot:road:query')")
+    @GetMapping("{id}")
+    public AjaxResult getRoad(@PathVariable String id) {
+        return AjaxResult.success(dcRegionService.getById(id));
+    }
+
+
+    /**
+     * 新增
+     *
+     * @param dcRegion 新增参数
+     * @return 新增操作结果
+     */
+    @ApiOperation("新增")
+    @PreAuthorize("@ss.hasPermi('iot:road:add')")
+    @Log(title = "新增道路", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult addRoad(@Valid @RequestBody DcRegion dcRegion) {
+        return toAjax(dcRegionService.save(dcRegion));
+    }
+
+    /**
+     * 修改
+     *
+     * @param dcRegion 修改参数
+     * @return 修改操作结果
+     */
+    @ApiOperation("修改")
+    @PreAuthorize("@ss.hasPermi('iot:road:edit')")
+    @Log(title = "修改道路", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult editRoad(@Valid @RequestBody DcRegion dcRegion) {
+        LambdaQueryWrapper<DcRegion> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(DcRegion::getId,dcRegion.getId());
+        return toAjax(dcRegionService.update(dcRegion,lambdaQueryWrapper));
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids id集
+     * @return 删除操作结果
+     */
+    @ApiOperation("删除")
+    @PreAuthorize("@ss.hasPermi('iot:road:remove')")
+    @Log(title = "删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("{ids}")
+    public AjaxResult removeRoad(@PathVariable List<String> ids) {
+        return toAjax(dcRegionService.removeByIds(ids));
+    }
+
+}

zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java

@@ -121,6 +121,11 @@ public class OperationLogAspect {
             }
             Object[] pointArgs = joinPoint.getArgs();
 
+
+            //String operType = String.valueOf(pointArgs[pointArgs.length - 1]);
+            //operLog.setOperType(operType);
+
+
             HttpServletRequest request;
             try {
 
@@ -133,7 +138,7 @@ public class OperationLogAspect {
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String date = df.format(new Date());
             String sta = "";
-            if (Objects.equals(state, "0") && Objects.equals(String.valueOf(((AjaxResult)jsonResult).get("code")), "200")) {
+            if (Objects.equals(state, "0") && Objects.equals(String.valueOf(((AjaxResult) jsonResult).get("code")), "200")) {
                 operLog.setStatus(0);
                 sta = "成功";
             } else {
@@ -148,9 +153,9 @@ public class OperationLogAspect {
             if (operUrl.contains("batchFunctions")) {
                 //批量调用
                 JSONObject pointArg = null;
-                if (pointArgs[0] instanceof JSONObject){
+                if (pointArgs[0] instanceof JSONObject) {
                     pointArg = (JSONObject) pointArgs[0];
-                }else {
+                } else {
                     pointArg = (JSONObject) JSON.toJSON(pointArgs[0]);
                 }
 
@@ -229,7 +234,7 @@ public class OperationLogAspect {
                 LambdaQueryWrapper<DcDevice> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                 lambdaQueryWrapper.eq(DcDevice::getIotDeviceId, pointArgs[0]);
                 List<DcDevice> list = dcDeviceService.list(lambdaQueryWrapper);
-                DcDevice dcDevice =  list.get(0);
+                DcDevice dcDevice = list.get(0);
 
                 if (!Objects.isNull(dcDevice)) {
 

zc-business/src/main/java/com/zc/business/task/ScheduledTaskSchedulingTask.java

@@ -29,6 +29,7 @@ public class ScheduledTaskSchedulingTask {
             JSONArray jsonArray = JSONArray.parseArray(job.getCallParameter());
             for (Object o : jsonArray) {
                 deviceController.batchInvokedFunction(o);
+                //deviceController.batchInvokedFunction(o,1); todo
             }
         }
     }