From bd4677c69c6f4ddade00465dcad0048bd36bc7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Thu, 24 Jul 2025 01:30:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gxwebsoft/cms/entity/CmsDesign.java | 3 +++ .../cms/mapper/xml/CmsDesignMapper.xml | 9 ++++--- .../gxwebsoft/cms/param/CmsDesignParam.java | 3 +++ .../common/core/config/MqttProperties.java | 25 ++++++++----------- .../common/core/config/MybatisPlusConfig.java | 6 ++--- .../hjm/controller/MQTTClientDemo.java | 2 +- .../gxwebsoft/hjm/service/MqttService.java | 6 ----- .../hjm/task/PushHjmFenceOutController.java | 2 +- .../service/impl/HouseInfoServiceImpl.java | 2 +- .../project/controller/ProjectController.java | 6 ++--- .../controller/ProjectRenewController.java | 6 ++--- .../controller/ShopUserAddressController.java | 16 +++++++++++- .../shop/entity/ShopUserAddress.java | 5 ++-- .../shop/mapper/ShopUserAddressMapper.java | 2 +- .../shop/mapper/xml/ShopUserAddressMapper.xml | 1 + .../shop/param/ShopUserAddressParam.java | 2 +- .../shop/service/ShopUserAddressService.java | 2 +- .../impl/ShopUserAddressServiceImpl.java | 2 +- 18 files changed, 57 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java b/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java index 5be331b..db7badd 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java @@ -35,6 +35,9 @@ public class CmsDesign implements Serializable { @ApiModelProperty(value = "所属栏目ID") private Integer categoryId; + @ApiModelProperty(value = "页面模型") + private String model; + @ApiModelProperty(value = "页面关键词") private String keywords; diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsDesignMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsDesignMapper.xml index afbee30..ed0f2d5 100644 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsDesignMapper.xml +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsDesignMapper.xml @@ -14,12 +14,15 @@ AND a.name LIKE CONCAT('%', #{param.name}, '%') - - AND a.lang = #{param.lang} - + + AND a.lang = #{param.lang} + AND a.category_id = #{param.categoryId} + + AND a.model = #{param.model} + AND a.keywords LIKE CONCAT('%', #{param.keywords}, '%') diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsDesignParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsDesignParam.java index e16bf00..e6b37bc 100644 --- a/src/main/java/com/gxwebsoft/cms/param/CmsDesignParam.java +++ b/src/main/java/com/gxwebsoft/cms/param/CmsDesignParam.java @@ -33,6 +33,9 @@ public class CmsDesignParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer categoryId; + @ApiModelProperty(value = "页面模型") + private String model; + @ApiModelProperty(value = "页面关键词") private String keywords; diff --git a/src/main/java/com/gxwebsoft/common/core/config/MqttProperties.java b/src/main/java/com/gxwebsoft/common/core/config/MqttProperties.java index 8dd1fb8..173aae0 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/MqttProperties.java +++ b/src/main/java/com/gxwebsoft/common/core/config/MqttProperties.java @@ -14,57 +14,52 @@ import org.springframework.stereotype.Component; @Component @ConfigurationProperties(prefix = "mqtt") public class MqttProperties { - - /** - * 是否启用MQTT服务 - */ - private boolean enabled = true; - + /** * MQTT服务器地址 */ private String host = "tcp://127.0.0.1:1883"; - + /** * 用户名 */ private String username = ""; - + /** * 密码 */ private String password = ""; - + /** * 客户端ID前缀 */ private String clientIdPrefix = "mqtt_client_"; - + /** * 订阅主题 */ private String topic = "/SW_GPS/#"; - + /** * QoS等级 */ private int qos = 2; - + /** * 连接超时时间（秒） */ private int connectionTimeout = 10; - + /** * 心跳间隔（秒） */ private int keepAliveInterval = 20; - + /** * 是否自动重连 */ private boolean autoReconnect = true; - + /** * 是否清除会话 */ diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java index 575d8d6..16a6240 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java @@ -65,9 +65,9 @@ public class MybatisPlusConfig { "sys_dictionary", "sys_dictionary_data", "apps_test_data", - "cms_lang", - "hjm_car", - "hjm_fence" + "cms_lang" +// "hjm_car", +// "hjm_fence" // "cms_website" // "sys_user" // "cms_domain" diff --git a/src/main/java/com/gxwebsoft/hjm/controller/MQTTClientDemo.java b/src/main/java/com/gxwebsoft/hjm/controller/MQTTClientDemo.java index b28c546..585cafd 100644 --- a/src/main/java/com/gxwebsoft/hjm/controller/MQTTClientDemo.java +++ b/src/main/java/com/gxwebsoft/hjm/controller/MQTTClientDemo.java @@ -1,4 +1,4 @@ -package com.shengwei.iot.common.utils.mqtt; +package com.gxwebsoft.hjm.controller; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/com/gxwebsoft/hjm/service/MqttService.java b/src/main/java/com/gxwebsoft/hjm/service/MqttService.java index 45fb964..cabb66f 100644 --- a/src/main/java/com/gxwebsoft/hjm/service/MqttService.java +++ b/src/main/java/com/gxwebsoft/hjm/service/MqttService.java @@ -38,12 +38,6 @@ public class MqttService { @PostConstruct public void init() { try { - // 检查是否启用MQTT服务 - if (!mqttProperties.isEnabled()) { - logger.info("MQTT服务已禁用，跳过初始化"); - return; - } - logger.info("开始初始化MQTT服务..."); // 验证配置属性 diff --git a/src/main/java/com/gxwebsoft/hjm/task/PushHjmFenceOutController.java b/src/main/java/com/gxwebsoft/hjm/task/PushHjmFenceOutController.java index 3ba7d87..780993e 100644 --- a/src/main/java/com/gxwebsoft/hjm/task/PushHjmFenceOutController.java +++ b/src/main/java/com/gxwebsoft/hjm/task/PushHjmFenceOutController.java @@ -44,7 +44,7 @@ public class PushHjmFenceOutController extends BaseController { * @Scheduled(fixedDelay = 2000, initialDelay = 2000) * @Scheduled(cron = "0 0 9 * * ?") */ - @Scheduled(cron = "0 0/10 * * * ?") +// @Scheduled(cron = "0 0/10 * * * ?") public void index() { final List list = hjmCarService.list(new LambdaQueryWrapper() .eq(HjmCar::getStatus, 1) diff --git a/src/main/java/com/gxwebsoft/house/service/impl/HouseInfoServiceImpl.java b/src/main/java/com/gxwebsoft/house/service/impl/HouseInfoServiceImpl.java index ff0a440..e4046f7 100644 --- a/src/main/java/com/gxwebsoft/house/service/impl/HouseInfoServiceImpl.java +++ b/src/main/java/com/gxwebsoft/house/service/impl/HouseInfoServiceImpl.java @@ -144,7 +144,7 @@ public class HouseInfoServiceImpl extends ServiceImpl> count() { - Map data = new HashMap<>(); + Map data = new HashMap<>(); final User loginUser = getLoginUser(); if (loginUser == null) { return fail("请先登录", null); @@ -280,14 +280,14 @@ public class ProjectController extends BaseController { // TODO 今年已收续费总额 - java.math.BigDecimal yearTotalPrice = projectService.sumMoney(new LambdaQueryWrapper() + BigDecimal yearTotalPrice = projectService.sumMoney(new LambdaQueryWrapper() .between(Project::getUpdateTime, startOfYear, endOfYear) .eq(Project::getDeleted, 0) ); data.put("yearTotalPrice", yearTotalPrice); // TODO 去年已收续费总额 - java.math.BigDecimal lastTotalPrice = projectService.sumMoney(new LambdaQueryWrapper() + BigDecimal lastTotalPrice = projectService.sumMoney(new LambdaQueryWrapper() .between(Project::getUpdateTime, startOfLastYear, endOfLastYear) .eq(Project::getDeleted, 0) .eq(Project::getDeleted,0) diff --git a/src/main/java/com/gxwebsoft/project/controller/ProjectRenewController.java b/src/main/java/com/gxwebsoft/project/controller/ProjectRenewController.java index a01eb57..8c101a6 100644 --- a/src/main/java/com/gxwebsoft/project/controller/ProjectRenewController.java +++ b/src/main/java/com/gxwebsoft/project/controller/ProjectRenewController.java @@ -173,7 +173,7 @@ public class ProjectRenewController extends BaseController { @ApiOperation("统计信息") @GetMapping("/data") public ApiResult> data(ProjectParam param) { - Map data = new HashMap<>(); + Map data = new HashMap<>(); final User loginUser = getLoginUser(); if (loginUser == null) { return fail("请先登录", null); @@ -250,14 +250,14 @@ public class ProjectRenewController extends BaseController { data.put("monthTotalPrice", monthTotalPrice); // TODO 今年已收续费总额 - java.math.BigDecimal yearTotalPrice = projectRenewService.sumMoney(new LambdaQueryWrapper() + BigDecimal yearTotalPrice = projectRenewService.sumMoney(new LambdaQueryWrapper() .between(ProjectRenew::getCreateTime, startOfYear, endOfYear) .eq(ProjectRenew::getDeleted, 0) ); data.put("yearTotalPrice", yearTotalPrice); // TODO 去年已收续费总额 - java.math.BigDecimal lastTotalPrice = projectRenewService.sumMoney(new LambdaQueryWrapper() + BigDecimal lastTotalPrice = projectRenewService.sumMoney(new LambdaQueryWrapper() .eq(ProjectRenew::getDeleted, 0) .between(ProjectRenew::getEndTime, startOfLastYear, endOfLastYear)); // 去年已收续费总额 diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java index 081a326..ede00af 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java @@ -22,7 +22,7 @@ import java.util.List; * 收货地址控制器 * * @author 科技小王子 - * @since 2025-01-11 10:45:13 + * @since 2025-07-22 23:06:40 */ @Api(tags = "收货地址管理") @RestController @@ -31,6 +31,7 @@ public class ShopUserAddressController extends BaseController { @Resource private ShopUserAddressService shopUserAddressService; + @PreAuthorize("hasAuthority('shop:shopUserAddress:list')") @ApiOperation("分页查询收货地址") @GetMapping("/page") public ApiResult> page(ShopUserAddressParam param) { @@ -38,6 +39,7 @@ public class ShopUserAddressController extends BaseController { return success(shopUserAddressService.pageRel(param)); } + @PreAuthorize("hasAuthority('shop:shopUserAddress:list')") @ApiOperation("查询全部收货地址") @GetMapping() public ApiResult> list(ShopUserAddressParam param) { @@ -53,6 +55,8 @@ public class ShopUserAddressController extends BaseController { return success(shopUserAddressService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('shop:shopUserAddress:save')") + @OperationLog @ApiOperation("添加收货地址") @PostMapping() public ApiResult save(@RequestBody ShopUserAddress shopUserAddress) { @@ -67,6 +71,8 @@ public class ShopUserAddressController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('shop:shopUserAddress:update')") + @OperationLog @ApiOperation("修改收货地址") @PutMapping() public ApiResult update(@RequestBody ShopUserAddress shopUserAddress) { @@ -76,6 +82,8 @@ public class ShopUserAddressController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('shop:shopUserAddress:remove')") + @OperationLog @ApiOperation("删除收货地址") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -85,6 +93,8 @@ public class ShopUserAddressController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('shop:shopUserAddress:save')") + @OperationLog @ApiOperation("批量添加收货地址") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -94,6 +104,8 @@ public class ShopUserAddressController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('shop:shopUserAddress:update')") + @OperationLog @ApiOperation("批量修改收货地址") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -103,6 +115,8 @@ public class ShopUserAddressController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('shop:shopUserAddress:remove')") + @OperationLog @ApiOperation("批量删除收货地址") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java b/src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java index cdb2d9e..13d1aa0 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java @@ -2,8 +2,9 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; import java.io.Serializable; +import java.util.Date; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +14,7 @@ import lombok.EqualsAndHashCode; * 收货地址 * * @author 科技小王子 - * @since 2025-01-11 10:45:13 + * @since 2025-07-22 23:06:40 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopUserAddressMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopUserAddressMapper.java index 6c32493..d89f1a6 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopUserAddressMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopUserAddressMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 收货地址Mapper * * @author 科技小王子 - * @since 2025-01-11 10:45:13 + * @since 2025-07-22 23:06:40 */ public interface ShopUserAddressMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopUserAddressMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopUserAddressMapper.xml index eb47416..9bcf5f0 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopUserAddressMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopUserAddressMapper.xml @@ -60,6 +60,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + OR a.phone = #{param.keywords} ) diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopUserAddressParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopUserAddressParam.java index e2c9565..2394844 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopUserAddressParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopUserAddressParam.java @@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode; * 收货地址查询参数 * * @author 科技小王子 - * @since 2025-01-11 10:45:13 + * @since 2025-07-22 23:06:40 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java b/src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java index 0cc2a9b..6c00c3f 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java @@ -11,7 +11,7 @@ import java.util.List; * 收货地址Service * * @author 科技小王子 - * @since 2025-01-11 10:45:13 + * @since 2025-07-22 23:06:40 */ public interface ShopUserAddressService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java index c0a4d07..ad53f27 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 收货地址Service实现 * * @author 科技小王子 - * @since 2025-01-11 10:45:13 + * @since 2025-07-22 23:06:40 */ @Service public class ShopUserAddressServiceImpl extends ServiceImpl implements ShopUserAddressService {