数字工具类

huimv-admin/src/main/java/com/huimv/admin/HuimvAdminApplication.java

@@ -19,7 +19,4 @@ public class HuimvAdminApplication {
     public static RestTemplate getRestTemplate(){
         return new RestTemplate();
     }
-
-
-
 }

huimv-admin/src/main/java/com/huimv/admin/controller/EnergyEnvDeviceController.java

@@ -6,6 +6,7 @@ import com.huimv.admin.entity.EnergyEnvDevice;
 import com.huimv.admin.entity.EnvDevice;
 import com.huimv.admin.service.IEnergyEnvDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -22,6 +23,7 @@ import java.util.Map;
  * @author author
  * @since 2023-02-21
  */
+@CrossOrigin
 @RestController
 @RequestMapping("/admin/energyEnvDevice")
 public class EnergyEnvDeviceController {
@@ -34,13 +36,13 @@ public class EnergyEnvDeviceController {
     }
 
     @RequestMapping("/DeviceAdd")
-    public Result getDeviceAdd(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        return energyEnvDeviceService.add(httpServletRequest,paramsMap);
+    public Result getDeviceAdd(HttpServletRequest httpServletRequest, @RequestBody EnergyEnvDevice energyEnvDevice) {
+        return energyEnvDeviceService.add(httpServletRequest,energyEnvDevice);
     }
 
     @RequestMapping("/DeviceEdit")
-    public Result getDeviceEdit(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        return energyEnvDeviceService.edit(httpServletRequest,paramsMap);
+    public Result getDeviceEdit(HttpServletRequest httpServletRequest, @RequestBody EnergyEnvDevice energyEnvDevice) {
+        return energyEnvDeviceService.edit(httpServletRequest,energyEnvDevice);
     }
 
     @RequestMapping("/DeviceDelete")

huimv-admin/src/main/java/com/huimv/admin/service/IEnergyEnvDeviceService.java

@@ -20,9 +20,9 @@ public interface IEnergyEnvDeviceService extends IService<EnergyEnvDevice> {
 
     Result list(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
-    Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+    Result add(HttpServletRequest httpServletRequest, EnergyEnvDevice energyEnvDevice);
 
-    Result edit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+    Result edit(HttpServletRequest httpServletRequest,  EnergyEnvDevice energyEnvDevice);
 
     Result delete(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnergyEnvDeviceServiceImpl.java

@@ -2,6 +2,7 @@ package com.huimv.admin.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
@@ -47,27 +48,12 @@ public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMappe
     }
 
     @Override
-    public Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-        String farmId = paramsMap.get("farmId");
-        String DeviceName = paramsMap.get("DeviceName");
-        String BuildLocation = paramsMap.get("BuildLocation");
-        String DeviceBrand = paramsMap.get("DeviceBrand");
-        String remark = paramsMap.get("remark");
-        if (remark == null || remark == "") {
-            remark = null;
-        }
-
-        EnergyEnvDevice envDevice = new EnergyEnvDevice();
-        envDevice.setFarmId(Integer.parseInt(farmId));
-        envDevice.setDeviceName(DeviceName);
-        envDevice.setBuildLocation(BuildLocation);
-        envDevice.setDeviceBrand(DeviceBrand);
-        envDevice.setRemark(remark);
+    public Result add(HttpServletRequest httpServletRequest, EnergyEnvDevice energyEnvDevice) {
         QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("device_name", DeviceName).eq("farm_id",farmId);
+        queryWrapper.eq("device_name", energyEnvDevice.getDeviceName()).eq("farm_id",energyEnvDevice.getFarmId());
         EnergyEnvDevice device = energyEnvDeviceMapper.selectOne(queryWrapper);
         if (ObjectUtil.isEmpty(device)) {
-            energyEnvDeviceMapper.insert(envDevice);
+            energyEnvDeviceMapper.insert(energyEnvDevice);
         } else {
             return new Result(ResultCode.FAIL, "设备名称已存在");
         }
@@ -75,30 +61,13 @@ public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMappe
     }
 
     @Override
-    public Result edit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-        String farmId = paramsMap.get("farmId");
-        String id = paramsMap.get("id");
-        String DeviceName = paramsMap.get("DeviceName");
-        String BuildLocation = paramsMap.get("BuildLocation");
-        String DeviceBrand = paramsMap.get("DeviceBrand");
-        String remark = paramsMap.get("remark");
-        if (remark == null || remark == "") {
-            remark = null;
-        }
-
-        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("id", id);
-        EnergyEnvDevice envDevice = energyEnvDeviceMapper.selectOne(queryWrapper);
-        envDevice.setFarmId(Integer.parseInt(farmId));
-        envDevice.setDeviceName(DeviceName);
-        envDevice.setDeviceBrand(DeviceBrand);
-        envDevice.setBuildLocation(BuildLocation);
-        envDevice.setRemark(remark);
+    public Result edit(HttpServletRequest httpServletRequest,  EnergyEnvDevice energyEnvDevice) {
+        String deviceName = energyEnvDevice.getDeviceName();
 
         QueryWrapper<EnergyEnvDevice> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("device_name", DeviceName);
+        queryWrapper1.eq(StringUtils.isNotBlank(deviceName),"device_name", deviceName).ne("id",energyEnvDevice.getId());
         if (ObjectUtil.isEmpty(energyEnvDeviceMapper.selectOne(queryWrapper1))) {
-            energyEnvDeviceMapper.updateById(envDevice);
+            energyEnvDeviceMapper.updateById(energyEnvDevice);
         } else {
             return new Result(ResultCode.FAIL, "设备名称已存在");
         }
@@ -115,7 +84,6 @@ public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMappe
         return new Result(ResultCode.SUCCESS,"删除成功");
     }
 
-
     @Override
     public Result bandingUnitId(HttpServletRequest httpServletRequest, EnergyEnvDevice envDevice) {
         Integer unitId = envDevice.getUnitId();