远程配置V2.0

nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusConfigLogEntity.java

@@ -0,0 +1,12 @@
+package com.nb.web.api.entity;
+
+/**
+ * @author zsl
+ * @version 1.0.0
+ * @ClassName BusConfigLogEntity.java
+ * @Description TODO
+ * @createTime 2023/7/614:02
+ */
+public class BusConfigLogEntity extends BusDeviceConfigurationEntity{
+
+}

nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusDeviceConfigurationEntity.java

@@ -3,6 +3,7 @@ package com.nb.web.api.entity;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.nb.common.config.mybatisplus.handler.TenantNameHandler;
 import com.nb.core.entity.TenantGenericEntity;
 import com.nb.web.api.enums.DeviceTypeEnum;
 import io.swagger.annotations.ApiModel;
@@ -46,8 +47,8 @@ public class BusDeviceConfigurationEntity extends TenantGenericEntity<String,Str
     @Length(max = 255,message = "设备类型不得超过255个字符")
     private DeviceTypeEnum type;
 
-/*    @TableField(value = "tenant_id",typeHandler = TenantNameHandler.class,updateStrategy = FieldStrategy.NEVER,insertStrategy = FieldStrategy.NEVER)
-    private String tenantName;*/
+    @TableField(value = "tenant_id",typeHandler = TenantNameHandler.class,updateStrategy = FieldStrategy.NEVER,insertStrategy = FieldStrategy.NEVER)
+    private String tenantName;
 
 
     @ApiModelProperty(value = "总量",accessMode = ApiModelProperty.AccessMode.READ_ONLY)

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusConfigLogController.java

@@ -0,0 +1,34 @@
+package com.nb.web.service.bus.controller;
+
+import com.baomidou.mybatisplus.core.mapper.Mapper;
+import com.nb.common.crud.BaseService;
+import com.nb.common.crud.controller.BaseCrudController;
+import com.nb.web.api.entity.BusConfigLogEntity;
+import com.nb.web.service.bus.service.LocalBusConfigLogService;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zsl
+ * @version 1.0.0
+ * @ClassName BusConfigLogController.java
+ * @Description TODO
+ * @createTime 2023/7/614:10
+ */
+
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/bus/remote/configuration")
+@Api(tags = "设备远程配置日志管理",description = "统一权限前缀(device:configuration)")
+public class BusConfigLogController  extends BaseCrudController<BusConfigLogEntity, String> {
+    private final LocalBusConfigLogService configLogService;
+
+    @Override
+    public BaseService<? extends Mapper<BusConfigLogEntity>, BusConfigLogEntity, String> getService() {
+        return configLogService;
+    }
+}

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusDeviceConfigurationController.java

@@ -31,8 +31,8 @@ import java.util.List;
 @Slf4j
 @RestController
 @AllArgsConstructor
-@RequestMapping("/bus/device/configuration")
-@Api(tags = "设备远程配置管理",description = "统一权限前缀(device:configuration),device:configuration:add")
+@RequestMapping("/bus/remote/configuration")
+@Api(tags = "设备远程配置管理",description = "统一权限前缀(device:configuration)")
 public class BusDeviceConfigurationController  extends BaseCrudController<BusDeviceConfigurationEntity, String> {
     private final LocalBusDeviceConfigurationService configurationService;
 
@@ -45,18 +45,17 @@ public class BusDeviceConfigurationController  extends BaseCrudController<BusDev
         return "device:configuration";
     }
 
-    @PostMapping("/list")
-    @SaCheckPermission("device:configuration:list")
-    @ApiOperation(value = "远程配置查询",notes = "权限【device:configuration:list】")
+     @SaCheckPermission("device:configuration:list")
+    @ApiOperation(value = "远程配置管理查询",notes = "权限【device:configuration:list】")
     public R<List<DeviceConfigurationResult>> list(@RequestBody DeviceConfigurationQuery query){
         return R.success(configurationService.selectAll(query));
     }
 
     @PostMapping("/update")
     @SaCheckPermission("device:configuration:update")
-    @ApiOperation(value = "远程配置查询",notes = "权限【device:configuration:update】")
-    public R updateConfiguration(@RequestBody ConfigurationParamVo configurationParamVo, @RequestBody List<BusDeviceConfigurationEntity> deviceConfigurationEntitys){
-        return R.success(configurationService.updateConfiguration(configurationParamVo ,deviceConfigurationEntitys));
+    @ApiOperation(value = "编辑远程配置管理",notes = "权限【device:configuration:update】")
+    public R updateConfiguration(@RequestBody ConfigurationParamVo config, @RequestBody List<BusDeviceConfigurationEntity> device){
+        return R.success(configurationService.updateConfiguration(config ,device));
     }
 
 

nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/BusCinfigLogMapper.java

@@ -0,0 +1,17 @@
+package com.nb.web.service.bus.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.nb.web.api.entity.BusConfigLogEntity;
+import com.nb.web.api.entity.BusDeviceConfigurationEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author zsl
+ * @version 1.0.0
+ * @ClassName BusCinfigLogMapper.java
+ * @Description TODO
+ * @createTime 2023/7/614:03
+ */
+@Mapper
+public interface BusCinfigLogMapper extends BaseMapper<BusConfigLogEntity> {
+}

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusConfigLogService.java

@@ -0,0 +1,35 @@
+package com.nb.web.service.bus.service;
+
+import com.nb.common.crud.BaseService;
+import com.nb.web.api.entity.BusConfigLogEntity;
+import com.nb.web.api.entity.BusHospitalLogEntity;
+import com.nb.web.api.feign.IHospitalLogClient;
+import com.nb.web.service.bus.mapper.BusCinfigLogMapper;
+import com.nb.web.service.bus.mapper.BusHospitalLogMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zsl
+ * @version 1.0.0
+ * @ClassName LocalBusConfigLogService.java
+ * @Description TODO
+ * @createTime 2023/7/614:06
+ */
+@Service
+public class LocalBusConfigLogService extends BaseService<BusCinfigLogMapper, BusConfigLogEntity,String>{
+    @Override
+    public void validateBeforeSave(BusConfigLogEntity entity) {
+
+    }
+
+    @Override
+    public void validateBeforeUpdate(BusConfigLogEntity entity) {
+
+    }
+
+    @Override
+    public void validateBeforeDelete(String id) {
+
+    }
+
+}

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceConfigurationService.java

@@ -1,11 +1,15 @@
 package com.nb.web.service.bus.service;
 
 import com.nb.common.crud.BaseService;
+import com.nb.web.api.entity.BusConfigLogEntity;
 import com.nb.web.service.bus.controller.vo.ConfigurationParamVo;
+import com.nb.web.service.bus.mapper.BusCinfigLogMapper;
 import com.nb.web.service.bus.mapper.BusDeviceConfigurationMapper;
 import com.nb.web.api.entity.BusDeviceConfigurationEntity;
 import com.nb.web.service.bus.service.dto.DeviceConfigurationQuery;
 import com.nb.web.service.bus.service.dto.DeviceConfigurationResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -19,6 +23,9 @@ import java.util.List;
  */
 @Service
 public class LocalBusDeviceConfigurationService extends BaseService<BusDeviceConfigurationMapper, BusDeviceConfigurationEntity,String> {
+    @Autowired
+    @Lazy
+    private BusCinfigLogMapper busCinfigLogMapper;
 
     @Override
     public void validateBeforeSave(BusDeviceConfigurationEntity entity) {
@@ -57,7 +64,9 @@ public class LocalBusDeviceConfigurationService extends BaseService<BusDeviceCon
             if( i1 ==0 ){
                 i1 = baseMapper.updateByDeviceId(entity);
             }
+            busCinfigLogMapper.insert((BusConfigLogEntity) entity);
             i +=i1;
+
         }
 
 

nb-service/web-service/src/main/resources/mapper/bus/BusDeviceConfigurationMapper.xml

@@ -33,8 +33,9 @@
         FROM
             (select * from bus_device
             <where>
+                is_delete = 0 and status != '0'
                 <if test="query.deviceId!=null">
-                    device_id = #{query.deviceId}
+                    and device_id = #{query.deviceId}
                 </if>
                 <if test="query.alias!=null">
                     and alias like concat('%',#{query.alias},'%')