From 1e72c39e3cb523e2037b8a1b0dc29123086698e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 25 Apr 2025 10:03:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/TbProjectController.java | 12 +++++ .../basic/dao/TbProjectMapper.java | 2 + .../basic/service/TbProjectService.java | 7 +++ .../service/impl/TbProjectServiceImpl.java | 48 +++++++++++++++++-- .../digitalSignage/basic/vo/TbProjectVo.java | 4 +- .../system/controller/DistinctController.java | 21 ++++++++ .../system/dao/DistinctDao.java | 2 + .../system/service/DistinctService.java | 10 ++++ .../service/impl/DistinctServiceImpl.java | 5 ++ .../mappers/basic/TbProjectMapper.xml | 18 +++++++ .../mappers/system/DistinctMapper.xml | 17 ++++++- 11 files changed, 138 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java index 2188b83..0d23873 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java +++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java @@ -54,5 +54,17 @@ public class TbProjectController { return tbProjectService.getTbProjectById(dto.getData()); } + /** + * 线路工程管理-修改 + * @param dto + * @return + */ + @PostMapping(value = "UpdateTbProject") + @DecryptAndVerify(decryptedClass = TbProjectVo.class)//加解密统一管理 + @LogAnnotation(operModul = "基础管理-线路工程管理", operation = "修改", operDesc = "系统级事件",operType="查询") + public ServerResponse UpdateTbProject(EncryptedReq dto) { + return tbProjectService.UpdateTbProject(dto.getData()); + } + } diff --git a/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java b/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java index 4315d61..473c455 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java +++ b/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java @@ -8,4 +8,6 @@ public interface TbProjectMapper { List getTbProjectList(TbProjectVo data); TbProjectVo getTbProjectById(TbProjectVo data); + + void UpdateTbProject(TbProjectVo data); } diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/TbProjectService.java b/src/main/java/com/bonus/digitalSignage/basic/service/TbProjectService.java index 072ae20..65c3477 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/TbProjectService.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/TbProjectService.java @@ -17,4 +17,11 @@ public interface TbProjectService { * @return */ ServerResponse getTbProjectById(TbProjectVo data); + + /** + * 线路工程管理-修改 + * @param data + * @return + */ + ServerResponse UpdateTbProject(TbProjectVo data); } diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java index bd79ba8..82a02a7 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java @@ -5,12 +5,15 @@ import com.bonus.digitalSignage.basic.dao.TbProjectMapper; import com.bonus.digitalSignage.basic.service.TbProjectService; import com.bonus.digitalSignage.basic.vo.TbProjectVo; import com.bonus.digitalSignage.utils.ServerResponse; +import com.bonus.digitalSignage.utils.UserUtil; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; +import java.util.Optional; /** * @author 马三炮 @@ -30,14 +33,49 @@ public class TbProjectServiceImpl implements TbProjectService { */ @Override public ServerResponse getTbProjectList(TbProjectVo data) { - List tbProjectVoList = tbProjectMapper.getTbProjectList(data); - PageInfo pageInfo = new PageInfo<>(tbProjectVoList); - return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize()); + try { + List tbProjectVoList = tbProjectMapper.getTbProjectList(data); + PageInfo pageInfo = new PageInfo<>(tbProjectVoList); + return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize()); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("查询列表失败"); + } + } + /** + * 线路工程管理-查询详情 + * @param data + * @return + */ @Override public ServerResponse getTbProjectById(TbProjectVo data) { - TbProjectVo tbProject = tbProjectMapper.getTbProjectById(data); - return ServerResponse.createSuccess(tbProject); + try { + TbProjectVo tbProject = tbProjectMapper.getTbProjectById(data); + return ServerResponse.createSuccess(tbProject); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("查询详情失败"); + } + + } + + /** + * 线路工程管理-修改 + * @param data + * @return + */ + @Override + public ServerResponse UpdateTbProject(TbProjectVo data) { + try { + Long userId = UserUtil.getLoginUser().getId(); + data.setUpdateUserId(userId); + tbProjectMapper.UpdateTbProject(data); + return ServerResponse.createSuccess(); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("修改失败"); + } } } diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java index 2e32e79..eb347b7 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java @@ -89,12 +89,12 @@ public class TbProjectVo { /** * 创建人 */ - private Date createUserId; + private Long createUserId; /** * 修改人 */ - private Date updateUserId; + private Long updateUserId; private int pageNum = 1; private int pageSize = 10; diff --git a/src/main/java/com/bonus/digitalSignage/system/controller/DistinctController.java b/src/main/java/com/bonus/digitalSignage/system/controller/DistinctController.java index 85a97df..674cb2a 100644 --- a/src/main/java/com/bonus/digitalSignage/system/controller/DistinctController.java +++ b/src/main/java/com/bonus/digitalSignage/system/controller/DistinctController.java @@ -128,4 +128,25 @@ public class DistinctController { public ServerResponse isRepeat(EncryptedReq vo) { return service.isRepeat(vo); } + + /** + * @param dto + * @return ServerResponse + * @description 查询字典列表 + * @author cwchen + * @date 2023/11/1 15:06 + */ + @PostMapping(value = "getDistinctListByParentCode") + @DecryptAndVerify(decryptedClass = DistinctDto.class)//加解密统一管理 + @LogAnnotation(operModul = "系统管理-字典管理", operation = "查询字典列表", operDesc = "业务级事件", operType = "查询") + @PreAuthorize("@pms.hasPermission('sys:dict:query')") + public ServerResponse getDistinctListByParentCode(EncryptedReq dto) { + List list = new ArrayList(); + try { + list = service.getDistinctListByParentCode(dto.getData()); + } catch (Exception e) { + log.error("字典列表", e); + } + return ServerResponse.createSuccess(list); + } } diff --git a/src/main/java/com/bonus/digitalSignage/system/dao/DistinctDao.java b/src/main/java/com/bonus/digitalSignage/system/dao/DistinctDao.java index beff921..464f885 100644 --- a/src/main/java/com/bonus/digitalSignage/system/dao/DistinctDao.java +++ b/src/main/java/com/bonus/digitalSignage/system/dao/DistinctDao.java @@ -64,4 +64,6 @@ public interface DistinctDao { * @date 2023/10/13 15:18 */ int isHasChild(String id); + + List getDistinctListByParentCode(DistinctDto data); } diff --git a/src/main/java/com/bonus/digitalSignage/system/service/DistinctService.java b/src/main/java/com/bonus/digitalSignage/system/service/DistinctService.java index c4adb60..fd2f3ef 100644 --- a/src/main/java/com/bonus/digitalSignage/system/service/DistinctService.java +++ b/src/main/java/com/bonus/digitalSignage/system/service/DistinctService.java @@ -57,4 +57,14 @@ public interface DistinctService { * @date 2023/10/13 15:09 */ ServerResponse getDistinctById(DistinctVo data); + + + /** + * @param data + * @return ServerResponse + * @description 查询字典列表 + * @author cwchen + * @date 2023/11/1 15:06 + */ + List getDistinctListByParentCode(DistinctDto data); } diff --git a/src/main/java/com/bonus/digitalSignage/system/service/impl/DistinctServiceImpl.java b/src/main/java/com/bonus/digitalSignage/system/service/impl/DistinctServiceImpl.java index 669f419..e13e206 100644 --- a/src/main/java/com/bonus/digitalSignage/system/service/impl/DistinctServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/system/service/impl/DistinctServiceImpl.java @@ -137,6 +137,11 @@ public class DistinctServiceImpl implements DistinctService { return ServerResponse.createSuccess("获取成功", vo); } + @Override + public List getDistinctListByParentCode(DistinctDto data) { + return mapper.getDistinctListByParentCode(data); + } + @Override public ServerResponse isRepeat(EncryptedReq vo) { try { diff --git a/src/main/resources/mappers/basic/TbProjectMapper.xml b/src/main/resources/mappers/basic/TbProjectMapper.xml index 0c375d5..3339eaf 100644 --- a/src/main/resources/mappers/basic/TbProjectMapper.xml +++ b/src/main/resources/mappers/basic/TbProjectMapper.xml @@ -2,6 +2,24 @@ + + update tb_project + + depart_id = #{departId}, + pro_name = #{proName}, + voltage_level = #{voltageLevel}, + line_length = #{lineLength}, + plan_start_time = #{planStartTime}, + plan_end_time = #{planEndTime}, + lon = #{lon}, + lat = #{lat}, + address = #{address}, + pro_status = #{proStatus}, + update_user_id = #{updateUserId}, + update_time = now() + + where id = #{id} + - \ No newline at end of file + + From 5bc9c1bdba01eff4600cd7163571f8c30bfa8a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 25 Apr 2025 10:31:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/TbProjectController.java | 12 ++++++ .../basic/dao/TbProjectMapper.java | 4 ++ .../basic/service/TbProjectService.java | 7 +++ .../service/impl/TbProjectServiceImpl.java | 31 ++++++++++++- .../mappers/basic/TbProjectMapper.xml | 43 ++++++++++++++++++- 5 files changed, 94 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java index 0d23873..5c7ee8f 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java +++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java @@ -54,6 +54,18 @@ public class TbProjectController { return tbProjectService.getTbProjectById(dto.getData()); } + /** + * 线路工程管理-新增 + * @param dto + * @return + */ + @PostMapping(value = "addTbProject") + @DecryptAndVerify(decryptedClass = TbProjectVo.class)//加解密统一管理 + @LogAnnotation(operModul = "基础管理-线路工程管理", operation = "新增", operDesc = "系统级事件",operType="查询") + public ServerResponse addTbProject(EncryptedReq dto) { + return tbProjectService.addTbProject(dto.getData()); + } + /** * 线路工程管理-修改 * @param dto diff --git a/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java b/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java index 473c455..a4a2229 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java +++ b/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java @@ -10,4 +10,8 @@ public interface TbProjectMapper { TbProjectVo getTbProjectById(TbProjectVo data); void UpdateTbProject(TbProjectVo data); + + void addTbProject(TbProjectVo data); + + TbProjectVo getTbProjectByProName(TbProjectVo data); } diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/TbProjectService.java b/src/main/java/com/bonus/digitalSignage/basic/service/TbProjectService.java index 65c3477..e880075 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/TbProjectService.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/TbProjectService.java @@ -24,4 +24,11 @@ public interface TbProjectService { * @return */ ServerResponse UpdateTbProject(TbProjectVo data); + + /** + * 线路工程管理-新增 + * @param data + * @return + */ + ServerResponse addTbProject(TbProjectVo data); } diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java index 82a02a7..3d950ea 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java @@ -6,12 +6,14 @@ import com.bonus.digitalSignage.basic.service.TbProjectService; import com.bonus.digitalSignage.basic.vo.TbProjectVo; import com.bonus.digitalSignage.utils.ServerResponse; import com.bonus.digitalSignage.utils.UserUtil; +import com.bonus.digitalSignage.webResult.StringUtils; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Optional; @@ -69,13 +71,40 @@ public class TbProjectServiceImpl implements TbProjectService { @Override public ServerResponse UpdateTbProject(TbProjectVo data) { try { + TbProjectVo tbProjectVo = tbProjectMapper.getTbProjectByProName(data); + if (StringUtils.isNotNull(tbProjectVo) && data.getId()!=tbProjectVo.getId()){ + return ServerResponse.createErroe("该项目部下以存在该工程"); + } Long userId = UserUtil.getLoginUser().getId(); data.setUpdateUserId(userId); tbProjectMapper.UpdateTbProject(data); - return ServerResponse.createSuccess(); + return ServerResponse.createSuccess("修改成功"); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("修改失败"); } } + + /** + * 线路工程管理-新增 + * @param data + * @return + */ + @Override + public ServerResponse addTbProject(TbProjectVo data) { + try { + TbProjectVo tbProjectVo = tbProjectMapper.getTbProjectByProName(data); + if (StringUtils.isNotNull(tbProjectVo)){ + return ServerResponse.createErroe("该项目部下以存在该工程"); + } + Long userId = UserUtil.getLoginUser().getId(); + data.setCreateUserId(userId); + data.setCreateTime(new Date()); + tbProjectMapper.addTbProject(data); + return ServerResponse.createSuccess(); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("新增失败"); + } + } } diff --git a/src/main/resources/mappers/basic/TbProjectMapper.xml b/src/main/resources/mappers/basic/TbProjectMapper.xml index 3339eaf..7703fcb 100644 --- a/src/main/resources/mappers/basic/TbProjectMapper.xml +++ b/src/main/resources/mappers/basic/TbProjectMapper.xml @@ -2,6 +2,39 @@ + + insert into tb_project + + depart_id, + pro_name, + voltage_level, + line_length, + plan_start_time, + plan_end_time, + lon, + lat, + address, + pro_status, + create_time, + create_user, + is_active + + + #{departId}, + #{proName}, + #{voltageLevel}, + #{lineLength}, + #{planStartTime}, + #{planEndTime}, + #{lon}, + #{lat}, + #{address}, + #{proStatus}, + #{createTime}, + #{createUser}, + 1 + + update tb_project @@ -22,7 +55,7 @@ +