From ae09cc1996fd2d9a564ee5fc14a1c299740ddb3a Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Fri, 19 Dec 2025 16:13:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=80=E6=AC=A1=E6=8E=A5?= =?UTF-8?q?=E7=BA=BF=E5=9B=BE=E5=AE=9E=E6=97=B6=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/csharmonic/pojo/po/CsPageUser.java | 20 ++++++++ .../controller/CsPagePOController.java | 46 ++++++++++++++----- .../csharmonic/mapper/CsPageUserMapper.java | 13 ++++++ .../mapper/mapping/CsPageUserMapper.xml | 5 ++ .../csharmonic/service/CsPageUserService.java | 10 ++++ .../service/impl/CsPageUserServiceImpl.java | 39 ++++++++++++++++ 6 files changed, 121 insertions(+), 12 deletions(-) create mode 100644 cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsPageUser.java create mode 100644 cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsPageUserMapper.java create mode 100644 cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsPageUserMapper.xml create mode 100644 cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsPageUserService.java create mode 100644 cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPageUserServiceImpl.java diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsPageUser.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsPageUser.java new file mode 100644 index 0000000..ae221bd --- /dev/null +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsPageUser.java @@ -0,0 +1,20 @@ +package com.njcn.csharmonic.pojo.po; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class CsPageUser implements Serializable { + + /** + * 组态界面ID + */ + private String pageId; + + /** + * 用户ID + */ + private String userId; + +} diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsPagePOController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsPagePOController.java index a30ff7a..7827a76 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsPagePOController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsPagePOController.java @@ -7,8 +7,10 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.csharmonic.param.CsPageParm; +import com.njcn.csharmonic.pojo.po.CsPageUser; import com.njcn.csharmonic.pojo.vo.CsPageVO; import com.njcn.csharmonic.service.CsPagePOService; +import com.njcn.csharmonic.service.CsPageUserService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -21,48 +23,68 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** -* (cs_page)表控制层 -* -* @author xxxxx -*/ + * (cs_page)表控制层 + * + * @author xxxxx + */ @RestController @RequestMapping("/cspage") @Api(tags = "组态项目页面") @AllArgsConstructor -public class CsPagePOController extends BaseController { +public class CsPagePOController extends BaseController { private final CsPagePOService csPagePOService; + private final CsPageUserService csPageUserService; + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/add") @ApiOperation("新增组态页面") // @ApiImplicitParam(name = "csPageParm", value = "新增组态项目参数", required = true) - public HttpResult add( @Validated CsPageParm csPageParm){ + public HttpResult add(@Validated CsPageParm csPageParm) { String methodDescribe = getMethodDescribe("add"); - boolean flag = csPagePOService.add (csPageParm); + boolean flag = csPagePOService.add(csPageParm); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); } @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/audit") @ApiOperation("修改组态页面") - public HttpResult audit( @Validated CsPageParm.CsPageParmAuditParam auditParm){ + public HttpResult audit(@Validated CsPageParm.CsPageParmAuditParam auditParm) { String methodDescribe = getMethodDescribe("audit"); - boolean save = csPagePOService.audit (auditParm); + boolean save = csPagePOService.audit(auditParm); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryPage") @ApiOperation("组态页面分页查询") @ApiImplicitParam(name = "csPageParam", value = "组态项目查询参数", required = true) - public HttpResult> queryPage(@RequestBody @Validated CsPageParm.CsPageParmQueryParam csPageParam ){ + public HttpResult> queryPage(@RequestBody @Validated CsPageParm.CsPageParmQueryParam csPageParam) { String methodDescribe = getMethodDescribe("queryPage"); - IPage page = csPagePOService.queryPage (csPageParam); + IPage page = csPagePOService.queryPage(csPageParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); } + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/savePageIdWithUser") + @ApiOperation("保存组态界面与用户的关系") + public HttpResult savePageIdWithUser(CsPageUser csPageUser) { + String methodDescribe = getMethodDescribe("savePageIdWithUser"); + boolean flag = csPageUserService.savePageIdWithUser(csPageUser); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getByUserId") + @ApiOperation("根据用户id获取组件信息") + public HttpResult getByUserId(String userId) { + String methodDescribe = getMethodDescribe("getByUserId"); + CsPageUser csPageUser = csPageUserService.getByUserId(userId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csPageUser, methodDescribe); + } } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsPageUserMapper.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsPageUserMapper.java new file mode 100644 index 0000000..f6d4f87 --- /dev/null +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsPageUserMapper.java @@ -0,0 +1,13 @@ +package com.njcn.csharmonic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.csharmonic.pojo.po.CsPageUser; + +/** + *

+ * 数据集表 Mapper 接口 + *

+ */ +public interface CsPageUserMapper extends BaseMapper { + +} diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsPageUserMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsPageUserMapper.xml new file mode 100644 index 0000000..ce84094 --- /dev/null +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsPageUserMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsPageUserService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsPageUserService.java new file mode 100644 index 0000000..af793de --- /dev/null +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsPageUserService.java @@ -0,0 +1,10 @@ +package com.njcn.csharmonic.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.csharmonic.pojo.po.CsPageUser; + +public interface CsPageUserService extends IService { + boolean savePageIdWithUser(CsPageUser csPageUser); + + CsPageUser getByUserId(String userId); +} diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPageUserServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPageUserServiceImpl.java new file mode 100644 index 0000000..4fd2146 --- /dev/null +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPageUserServiceImpl.java @@ -0,0 +1,39 @@ +package com.njcn.csharmonic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.csharmonic.mapper.CsPageUserMapper; +import com.njcn.csharmonic.pojo.po.CsPageUser; +import com.njcn.csharmonic.service.CsPageUserService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Objects; + +@Service +@RequiredArgsConstructor +public class CsPageUserServiceImpl extends ServiceImpl implements CsPageUserService { + + @Override + public boolean savePageIdWithUser(CsPageUser csPageUser) { + // 首先获取该用户的数据，理论上只有一个，以后可能有多个 + CsPageUser csPageUser1 = this.getOne(new QueryWrapper().eq("user_id", csPageUser.getUserId())); + if(Objects.isNull(csPageUser1)){ + // 如果没有就插入 + return this.save(csPageUser); + }else{ + return this.update(csPageUser, new QueryWrapper().eq("user_id", csPageUser.getUserId())); + } + } + + @Override + public CsPageUser getByUserId(String userId) { + // 根据用户id获取组件信息 + CsPageUser csPageUser = this.getOne(new QueryWrapper().eq("user_id", userId)); + if(Objects.isNull(csPageUser)){ + throw new BusinessException("该用户不存在组件信息"); + } + return csPageUser; + } +}