Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/xcx/XCustomerActivityController.java

@@ -0,0 +1,52 @@
+package org.dromara.property.controller.xcx;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.property.domain.bo.CustomerActivityBo;
+import org.dromara.property.domain.vo.CustomerActivityVo;
+import org.dromara.property.service.ICustomerActivityService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * 客户服务-活动
+ * 前端访问路由地址为:/property/activity
+ *
+ * @author lsm
+ * @since 2025-09-11
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/xcx/activity")
+public class XCustomerActivityController extends BaseController {
+
+    private final ICustomerActivityService customerActivityService;
+
+    /**
+     * 查询客户服务-活动列表
+     */
+    @GetMapping("/list")
+    @SaCheckPermission("xcx:activity:list")
+    public TableDataInfo<CustomerActivityVo> list(CustomerActivityBo bo, PageQuery pageQuery) {
+        return customerActivityService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取客户服务-活动详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("xcx:activity:query")
+    @GetMapping("/{id}")
+    public R<CustomerActivityVo> getInfo(@NotNull(message = "主键不能为空")
+                                         @PathVariable("id") Long id) {
+        return R.ok(customerActivityService.queryById(id));
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CustomerActivityMapper.java

@@ -1,5 +1,6 @@
 package org.dromara.property.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.property.domain.CustomerActivity;
 import org.dromara.property.domain.vo.CustomerActivityVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -8,8 +9,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * 客户服务-活动Mapper接口
  *
  * @author yuyongle
- * @date 2025-09-08
+ * @since 2025-09-08
  */
+@Mapper
 public interface CustomerActivityMapper extends BaseMapperPlus<CustomerActivity, CustomerActivityVo> {
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerActivityServiceImpl.java

@@ -1,8 +1,6 @@
 package org.dromara.property.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -32,7 +30,7 @@ import java.util.Collection;
  * 客户服务-活动Service业务层处理
  *
  * @author yuyongle
- * @date 2025-09-08
+ * @since 2025-09-08
  */
 @Slf4j
 @RequiredArgsConstructor

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/residentImpl/ResidentPersonServiceImpl.java

@@ -202,6 +202,8 @@ public class ResidentPersonServiceImpl implements IResidentPersonService {
             }
         }
 
+        // 密码修改走单独接口
+        update.setPassword(null);
         boolean flag = baseMapper.updateById(update) > 0;
         Assert.isTrue(flag, "修改入驻员工失败！");
         return flag;