From 326dfe58103f00ac2de3ccfe908174955d7c01d0 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Wed, 23 Apr 2025 17:52:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(sip):=20=E6=B7=BB=E5=8A=A0=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 IMaintenanceService 接口和 MaintenanceServiceImpl 实现类 - 添加 MaintenanceRecord 和 MaintenanceRecordsDto 类 - 创建 MaintenanceMapper 接口和对应的 XML 文件- 在 MaintenanceController 中集成新功能 --- .../src/main/resources/application-druid.yml | 4 -- .../sip/controller/MaintenanceController.java | 38 +++++++++++++++++++ .../ruoyi/sip/domain/MaintenanceRecord.java | 27 +++++++++++++ .../ruoyi/sip/mapper/MaintenanceMapper.java | 8 ++++ .../sip/service/IMaintenanceService.java | 8 ++++ .../service/impl/MaintenanceServiceImpl.java | 38 +++++++++++++++++++ .../mapper/manage/MaintenanceMapper.xml | 18 +++++++++ 7 files changed, 137 insertions(+), 4 deletions(-) create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecord.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/MaintenanceMapper.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java create mode 100644 ruoyi-sip/src/main/resources/mapper/manage/MaintenanceMapper.xml diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 4fc2d74d..7f033ab1 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,11 +6,7 @@ spring: druid: # 主库数据源 master: -<<<<<<< HEAD - url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&rewriteBatchedStatements=true&allowMultiQueries=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -======= url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true ->>>>>>> 86c13c73368897b23df2c463fbe3202d994b8609 username: root password: unis@db # 从库数据源 diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java index 65968259..5d99107e 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java @@ -1,12 +1,19 @@ package com.ruoyi.sip.controller; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.sip.domain.MaintenanceRecordsDto; +import com.ruoyi.sip.service.IMaintenanceService; import com.ruoyi.sip.service.IOrderDeliveryService; +import com.ruoyi.sip.service.IOrderInfoService; +import com.ruoyi.sip.service.IProductInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; /** * @author : ch @@ -27,10 +34,41 @@ public class MaintenanceController { private String prefix = "manage/service"; + @Autowired + private IMaintenanceService service; + @Autowired + private IProductInfoService productInfoService; + @Autowired + private IOrderInfoService orderInfoService; + @Anonymous @GetMapping() public String service() { return prefix + "/service"; } + + + @GetMapping("/query") + @ResponseBody + @Anonymous + public AjaxResult query(MaintenanceRecordsDto dto) + { + return AjaxResult.success(service.query(dto)); + } + @GetMapping("/product") + @ResponseBody + @Anonymous + public AjaxResult product(MaintenanceRecordsDto dto) + { + return AjaxResult.success(productInfoService.query(dto)); + } + @GetMapping("/order") + @ResponseBody + @Anonymous + public AjaxResult order(MaintenanceRecordsDto dto) + { + return AjaxResult.success(orderInfoService.selectOrderInfoByMaintenance(dto)); + } + } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecord.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecord.java new file mode 100644 index 00000000..ca6c49b5 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecord.java @@ -0,0 +1,27 @@ +package com.ruoyi.sip.domain; + + +import lombok.Data; + +import java.util.Date; + +/** + * @author : ch + * @version : 1.0 + * @ClassName : MaintenanceRecordsDto + * @Description : + * @DATE : Created in 17:50 2025/4/22 + * 
       Copyright: Copyright(c) 2025
+ * 
       Company :   	紫光汇智信息技术有限公司
+ * Modification History: + * Date Author Version Discription + * -------------------------------------------------------------------------- + * 2025/04/22 ch 1.0 Why & What is modified: <修改原因描述> * + */ +@Data +public class MaintenanceRecord { + //开始时间 + private Date startDate; + + +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/MaintenanceMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/MaintenanceMapper.java new file mode 100644 index 00000000..a90a2b00 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/MaintenanceMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.sip.mapper; + +import com.ruoyi.sip.domain.MaintenanceRecord; +import com.ruoyi.sip.domain.MaintenanceRecordsDto; + +public interface MaintenanceMapper { + MaintenanceRecord query(MaintenanceRecordsDto dto); +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java new file mode 100644 index 00000000..b64d11c5 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java @@ -0,0 +1,8 @@ +package com.ruoyi.sip.service; + +import com.ruoyi.sip.domain.MaintenanceRecord; +import com.ruoyi.sip.domain.MaintenanceRecordsDto; + +public interface IMaintenanceService { + MaintenanceRecord query(MaintenanceRecordsDto dto); +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java new file mode 100644 index 00000000..de7def6d --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java @@ -0,0 +1,38 @@ +package com.ruoyi.sip.service.impl; + + +import com.ruoyi.sip.domain.MaintenanceRecord; +import com.ruoyi.sip.domain.MaintenanceRecordsDto; +import com.ruoyi.sip.mapper.MaintenanceMapper; +import com.ruoyi.sip.service.IMaintenanceService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; + +/** + * @author : ch + * @version : 1.0 + * @ClassName : MaintenanceServiceImpl + * @Description : + * @DATE : Created in 17:36 2025/4/23 + * 
       Copyright: Copyright(c) 2025
+ * 
       Company :   	紫光汇智信息技术有限公司
+ * Modification History: + * Date Author Version Discription + * -------------------------------------------------------------------------- + * 2025/04/23 ch 1.0 Why & What is modified: <修改原因描述> * + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class MaintenanceServiceImpl implements IMaintenanceService { + + @Resource + private MaintenanceMapper mapper; + + + @Override + public MaintenanceRecord query(MaintenanceRecordsDto dto) { + return mapper.query(dto); + } +} diff --git a/ruoyi-sip/src/main/resources/mapper/manage/MaintenanceMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/MaintenanceMapper.xml new file mode 100644 index 00000000..d7c5de73 --- /dev/null +++ b/ruoyi-sip/src/main/resources/mapper/manage/MaintenanceMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + \ No newline at end of file