环境设备新增

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

@@ -40,8 +40,8 @@ public class EnvDeviceController {
     }
 
     @RequestMapping("/DeviceAdd")
-    public Result getDeviceAdd(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        return envDeviceService.add(httpServletRequest,paramsMap);
+    public Result getDeviceAdd(HttpServletRequest httpServletRequest, @RequestBody EnvDevice envDevice) {
+        return envDeviceService.add(httpServletRequest,envDevice);
     }
 
     @RequestMapping("/DeviceEdit")

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

@@ -20,7 +20,7 @@ public interface IEnvDeviceService extends IService<EnvDevice> {
 
     Result list(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
-    Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+    Result add(HttpServletRequest httpServletRequest, EnvDevice envDevice);
 
     Result edit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

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

@@ -115,24 +115,9 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
     }
 
     @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;
-        }
-
-        EnvDevice envDevice = new EnvDevice();
-        envDevice.setFarmId(Integer.parseInt(farmId));
-        envDevice.setDeviceName(DeviceName);
-        envDevice.setBuildLocation(BuildLocation);
-        envDevice.setDeviceBrand(DeviceBrand);
-        envDevice.setRemark(remark);
+    public Result add(HttpServletRequest httpServletRequest, EnvDevice envDevice) {
         QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("device_name", DeviceName).eq("farm_id", farmId);
+        queryWrapper.eq("device_name", envDevice.getDeviceName()).eq("farm_id", envDevice.getFarmId());
         EnvDevice device = envDeviceMapper.selectOne(queryWrapper);
         if (ObjectUtil.isEmpty(device)) {
             envDeviceMapper.insert(envDevice);