Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

saas-module/src/main/java/com/makeit/controller/analysis/SaasModelManageController.java

@@ -7,13 +7,14 @@ import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.entity.saas.analysis.SaasModelManage;
 import com.makeit.entity.saas.analysis.SaasModelManage;
 import com.makeit.global.annotation.Action;
 import com.makeit.global.annotation.Action;
+import com.makeit.module.admin.dto.plat.PlatMenuQueryDTO;
 import com.makeit.service.saas.SaasModelManageService;
 import com.makeit.service.saas.SaasModelManageService;
 import com.makeit.utils.old.StringUtils;
 import com.makeit.utils.old.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
@@ -39,7 +40,7 @@ public class SaasModelManageController {
     @Action(module = "数据分析-模型管理", name = "分页列表", code = "saas:modelManage:page")
     @Action(module = "数据分析-模型管理", name = "分页列表", code = "saas:modelManage:page")
     @ApiOperation("分页列表")
     @ApiOperation("分页列表")
     @PostMapping("list")
     @PostMapping("list")
-    public ApiResponseEntity<List<SaasModelManage>> list(@RequestBody CommonNameDTO dto) {
+    public ApiResponseEntity<List<SaasModelManage>> list(@RequestBody PlatMenuQueryDTO dto) {
         return ApiResponseUtils.success(saasModelManageService.list(new QueryWrapper<SaasModelManage>().lambda()
         return ApiResponseUtils.success(saasModelManageService.list(new QueryWrapper<SaasModelManage>().lambda()
                 .like(StringUtils.isNotEmpty(dto.getName()),SaasModelManage::getName,dto.getName())));
                 .like(StringUtils.isNotEmpty(dto.getName()),SaasModelManage::getName,dto.getName())));
     }
     }

saas-module/src/main/java/com/makeit/controller/analysis/SaasReportManageController.java

@@ -11,9 +11,9 @@ import com.makeit.service.saas.SaasReportManageService;
 import com.makeit.utils.old.StringUtils;
 import com.makeit.utils.old.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 

server-service/src/main/java/com/makeit/service/saas/impl/SaasModelManageServiceImpl.java

@@ -32,6 +32,7 @@ public class SaasModelManageServiceImpl extends ServiceImpl<SaasModelManageMappe
         if (saasModelManage != null) {
         if (saasModelManage != null) {
             saasModelManage.setUpdateBy(commonUserVO == null ? "" : commonUserVO.getName());
             saasModelManage.setUpdateBy(commonUserVO == null ? "" : commonUserVO.getName());
             saasModelManage.setUpdateDate(LocalDateTime.now());
             saasModelManage.setUpdateDate(LocalDateTime.now());
+            updateById(saasModelManage);
         }
         }
     }
     }
 }
 }

server-service/src/main/java/com/makeit/service/saas/impl/SaasReportManageServiceImpl.java

@@ -33,6 +33,7 @@ public class SaasReportManageServiceImpl extends ServiceImpl<SaasReportManageMap
         if (saasReportManage != null) {
         if (saasReportManage != null) {
             saasReportManage.setUpdateBy(commonUserVO == null ? "" : commonUserVO.getName());
             saasReportManage.setUpdateBy(commonUserVO == null ? "" : commonUserVO.getName());
             saasReportManage.setUpdateDate(LocalDateTime.now());
             saasReportManage.setUpdateDate(LocalDateTime.now());
+            updateById(saasReportManage);
         }
         }
     }
     }
 }
 }