Browse Source

fix 项目启动失败

jay 2 years ago
parent
commit
915c81d3f8

+ 8 - 1
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserPostDataImpl.java

@@ -6,8 +6,11 @@ import cc.iotkit.data.dao.SysUserPostRepository;
 import cc.iotkit.data.model.TbSysUserPost;
 import cc.iotkit.data.system.ISysUserPostData;
 import cc.iotkit.model.system.SysUserPost;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -15,9 +18,13 @@ import java.util.List;
  * @Author:tfd
  * @Date:2023/5/30 17:04
  */
+
+@Primary
+@Service
+@RequiredArgsConstructor
 public class SysUserPostDataImpl implements ISysUserPostData, IJPACommData<SysUserPost, Long> {
 
-    @Autowired
+
     private SysUserPostRepository sysUserPostRepository;
 
     @Override

+ 4 - 0
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserRoleDataImpl.java

@@ -10,7 +10,9 @@ import cc.iotkit.model.system.SysUserRole;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Objects;
@@ -23,6 +25,8 @@ import static cc.iotkit.data.model.QTbSysUserRole.tbSysUserRole;
  * @Author:tfd
  * @Date:2023/5/30 16:36
  */
+@Primary
+@Service
 @RequiredArgsConstructor
 public class SysUserRoleDataImpl implements ISysUserRoleData, IJPACommData<SysUserRole, Long> {
 

+ 2 - 0
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/TaskInfoDataImpl.java

@@ -17,6 +17,7 @@ import cc.iotkit.data.model.TbTaskInfo;
 import cc.iotkit.data.service.convert.TaskInfoMapper;
 import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.TaskInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
@@ -31,6 +32,7 @@ import java.util.UUID;
 
 @Primary
 @Service
+@RequiredArgsConstructor
 public class TaskInfoDataImpl implements ITaskInfoData, IJPACommData<TaskInfo, String> {
 
     @Autowired

+ 2 - 0
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ThingModelDataImpl.java

@@ -17,6 +17,7 @@ import cc.iotkit.data.model.TbThingModel;
 import cc.iotkit.data.service.convert.ThingModelMapper;
 import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.product.ThingModel;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
@@ -29,6 +30,7 @@ import java.util.UUID;
 
 @Primary
 @Service
+@RequiredArgsConstructor
 public class ThingModelDataImpl implements IThingModelData, IJPACommData<ThingModel, String> {
 
     @Autowired

+ 2 - 0
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/UserInfoDataImpl.java

@@ -17,6 +17,7 @@ import cc.iotkit.data.model.TbUserInfo;
 import cc.iotkit.data.service.convert.UserInfoMapper;
 import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.UserInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
@@ -31,6 +32,7 @@ import java.util.UUID;
 
 @Primary
 @Service
+@RequiredArgsConstructor
 public class UserInfoDataImpl implements IUserInfoData, IJPACommData<UserInfo, String> {
 
     @Autowired

+ 6 - 4
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/VirtualDeviceDataImpl.java

@@ -20,6 +20,7 @@ import cc.iotkit.data.service.convert.VirtualDeviceMapper;
 import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.VirtualDevice;
 import cn.hutool.core.util.IdUtil;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
@@ -35,13 +36,14 @@ import java.util.stream.Collectors;
 
 @Primary
 @Service
+@RequiredArgsConstructor
 public class VirtualDeviceDataImpl implements IVirtualDeviceData, IJPACommData<VirtualDevice, String> {
 
-    @Autowired
-    private VirtualDeviceRepository virtualDeviceRepository;
 
-    @Autowired
-    private VirtualDeviceMappingRepository virtualDeviceMappingRepository;
+    private final VirtualDeviceRepository virtualDeviceRepository;
+
+
+    private final VirtualDeviceMappingRepository virtualDeviceMappingRepository;
 
 
     @Override

+ 1 - 1
iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysPostController.java

@@ -93,7 +93,7 @@ public class SysPostController extends BaseController {
     @ApiOperation("修改岗位")
     @SaCheckPermission("system:post:edit")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
-    @PostMapping
+    @PostMapping("/edit")
     public void edit(@RequestBody @Validated(EditGroup.class) Request<SysPostBo> post) {
         if (!postService.checkPostNameUnique(post.getData())) {
             fail("修改岗位'" + post.getData().getPostName() + "'失败,岗位名称已存在");