From bc6f3dca80c4a3554be17e989339d8cc569da34e Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Tue, 23 Dec 2025 08:49:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E6=80=81=E6=B7=BB=E5=8A=A0=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E7=9A=84=E6=A6=82=E5=BF=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csharmonic/param/CsConfigurationParm.java | 7 ++++++ .../csharmonic/pojo/po/CsConfigurationPO.java | 11 +++++--- .../controller/CsConfigurationController.java | 25 +++++++++---------- .../mapper/CsConfigurationMapper.java | 2 +- .../mapper/mapping/CsConfigurationMapper.xml | 1 + .../impl/CsConfigurationServiceImpl.java | 5 +++- .../service/impl/LineTargetServiceImpl.java | 1 + 7 files changed, 34 insertions(+), 18 deletions(-) diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java index 789e5f6..3de45f4 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java @@ -28,6 +28,11 @@ public class CsConfigurationParm { private String remark; + /** + * 数据范围 0 私有 1全局 + */ + private int scope; + private List projectIds; @@ -55,6 +60,8 @@ public class CsConfigurationParm { @EqualsAndHashCode(callSuper = true) public static class CsConfigurationQueryParam extends BaseParam { private String id; + @ApiModelProperty(value = "当前用户ID") + private String currentUserId; } diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsConfigurationPO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsConfigurationPO.java index 522d493..fe047c9 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsConfigurationPO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsConfigurationPO.java @@ -17,8 +17,8 @@ import lombok.NoArgsConstructor; */ @Data @NoArgsConstructor - @TableName(value = "cs_configuration") -public class CsConfigurationPO extends BaseEntity { +@TableName(value = "cs_configuration") +public class CsConfigurationPO extends BaseEntity { /** * id */ @@ -31,6 +31,12 @@ public class CsConfigurationPO extends BaseEntity { @TableField(value = "`name`") private String name; + /** + * 数据范围 0 私有 1全局 + */ + @TableField(value = "scope") + private int scope; + @TableField(value = "image_path") private String imagePath; @@ -50,7 +56,6 @@ public class CsConfigurationPO extends BaseEntity { private String status; - public static final String COL_ID = "id"; public static final String COL_NAME = "name"; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java index 90d01b2..e103c98 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java @@ -22,10 +22,10 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; /** -* (cs_configuration)表控制层 -* -* @author xxxxx -*/ + * (cs_configuration)表控制层 + * + * @author xxxxx + */ @Slf4j @RestController @RequestMapping("/csconfiguration") @@ -38,10 +38,10 @@ public class CsConfigurationController extends BaseController { @PostMapping("/add") @ApiOperation("新增组态项目") @ApiImplicitParam(name = "csConfigurationParm", value = "新增组态项目参数", required = true) - public HttpResult add(@RequestBody @Validated CsConfigurationParm csConfigurationParm){ + public HttpResult add(@RequestBody @Validated CsConfigurationParm csConfigurationParm) { String methodDescribe = getMethodDescribe("add"); - boolean save = csConfigurationService.add (csConfigurationParm); + boolean save = csConfigurationService.add(csConfigurationParm); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe); } @@ -49,23 +49,22 @@ public class CsConfigurationController extends BaseController { @PostMapping("/audit") @ApiOperation("修改组态项目") @ApiImplicitParam(name = "auditParm", value = "修改组态项目参数", required = true) - public HttpResult audit(@RequestBody @Validated CsConfigurationParm.CsConfigurationAuditParam auditParm){ + public HttpResult audit(@RequestBody @Validated CsConfigurationParm.CsConfigurationAuditParam auditParm) { String methodDescribe = getMethodDescribe("audit"); - boolean save = csConfigurationService.audit (auditParm); + boolean save = csConfigurationService.audit(auditParm); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryPage") @ApiOperation("组态项目分页查询") @ApiImplicitParam(name = "csConfigurationQueryParam", value = "组态项目查询参数", required = true) - public HttpResult> queryPage(@RequestBody @Validated CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam ){ + public HttpResult> queryPage(@RequestBody @Validated CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam) { String methodDescribe = getMethodDescribe("queryPage"); - IPage page = csConfigurationService.queryPage (csConfigurationQueryParam); + IPage page = csConfigurationService.queryPage(csConfigurationQueryParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); } @@ -73,10 +72,10 @@ public class CsConfigurationController extends BaseController { @PostMapping("/uploadImage") @ApiOperation("上传底图") @ApiImplicitParam(name = "file", value = "底图文件", required = true) - public HttpResult uploadImage(@RequestParam("file") MultipartFile issuesFile){ + public HttpResult uploadImage(@RequestParam("file") MultipartFile issuesFile) { String methodDescribe = getMethodDescribe("uploadImage"); String filePath = csConfigurationService.uploadImage(issuesFile); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,new MinIoUploadResDTO(issuesFile.getOriginalFilename(),filePath), methodDescribe); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, new MinIoUploadResDTO(issuesFile.getOriginalFilename(), filePath), methodDescribe); } } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsConfigurationMapper.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsConfigurationMapper.java index 3b5e97d..5428470 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsConfigurationMapper.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsConfigurationMapper.java @@ -16,5 +16,5 @@ import java.util.List; * @version V1.0.0 */ public interface CsConfigurationMapper extends BaseMapper { - Page queryPage(Page temppage, @Param("temp") CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam, @Param("list") List list); + Page queryPage(Page temppage, @Param("temp") CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam, @Param("list") List list, @Param("userId") String userId); } \ No newline at end of file diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml index fc17669..66bed94 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml @@ -24,6 +24,7 @@ #{item} + AND (a.scope = 1 OR (a.scope = 0 AND a.create_by = #{userId})) AND a.name like concat(concat("%",#{temp.searchValue}),"%") diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java index 1520d22..84cf723 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java @@ -124,7 +124,10 @@ public class CsConfigurationServiceImpl extends ServiceImpl csConfigurationPOPage = this.getBaseMapper().queryPage(temppage,csConfigurationQueryParam,data1); + + + + Page csConfigurationPOPage = this.getBaseMapper().queryPage(temppage,csConfigurationQueryParam,data1,csConfigurationQueryParam.getCurrentUserId()); // QueryWrapper query = new QueryWrapper<>(); // query.like(StringUtils.isNotBlank(csConfigurationQueryParam.getSearchValue()),CsConfigurationPO.COL_NAME,csConfigurationQueryParam.getSearchValue()). // le (StringUtils.isNotBlank (csConfigurationQueryParam.getSearchEndTime()), CsConfigurationPO.COL_CREATE_TIME, csConfigurationQueryParam.getSearchEndTime ( )). diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java index 7ac1588..eac1c8a 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java @@ -146,6 +146,7 @@ public class LineTargetServiceImpl implements ILineTargetService { String path = csPagePOService.queryById(id).getPath(); InputStream inputStream = fileStorageUtil.getFileStream(path); ZuTaiDTO zuTaiDto = analysisJson(inputStream); + zuTaiDto.getJson().forEach(item->{ if (ObjectUtil.isNotNull(item.getUIdType()) && item.getUIdType()) { Object lastElement = item.getUId().get(item.getUId().size() - 1);