Browse Source

变更需求

wangyangyang 4 years ago
parent
commit
de4f8dbb96

+ 1 - 1
sms_water/src/main/java/com/huaxu/config/ResourceServerConfig.java

@@ -17,7 +17,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .and()
                 .authorizeRequests()
                 .antMatchers("/swagger-ui.html","/webjars/**", "/webjars/**", "/swagger-resources/**",
-                       "/v2/**","/devicetype/**","/deviceParm/**")
+                       "/v2/**","/devicetype/**")
                 .permitAll() //配置不需要身份认证的请求路径
                 .anyRequest().authenticated() //其他所有访问路径都需要身份认证
                 .and()

+ 8 - 0
sms_water/src/main/java/com/huaxu/service/impl/DeviceParmServiceImpl.java

@@ -166,10 +166,18 @@ public class DeviceParmServiceImpl  implements DeviceParmService {
         if (deviceParmInfos.size() == 0 && deviceScenes.size() > 0) {
             //如果所有的参数未被选择,则取消掉设备与场景的关联关系
             deviceSceneService.removeById(deviceScenes.get(0).getId());
+
         } else if (deviceParmInfos.size() > 0) {
             //没有的时候创建关联关系
             if (deviceScenes.size() == 0) {
                 deviceSceneEntity.setParentSceneId(sceneEntity.getParentSceneId());
+                deviceSceneEntity.setTenantId(loginUser.getTenantId());
+                deviceSceneEntity.setCreateBy(loginUser.getName());
+                deviceSceneEntity.setDateCreate(new Date());
+                deviceSceneEntity.setUpdateBy(loginUser.getName());
+                deviceSceneEntity.setDateUpdate(new Date());
+                deviceSceneEntity.setStatus(1);
+                deviceSceneService.save(deviceSceneEntity);
             }
             //查询已经绑定的所有参数
             List<DeviceParmInfoDto> deviceParmInfoList = deviceParmMapper.selectBindByDeviceId(sceneId, deviceId);