feature 代码提交

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/RegistrationService.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.zhsw.system.wechat;
 
 import com.rongwe.zhsw.system.vo.WeChatFeedbackReportVo;
 import com.rongwe.zhsw.system.vo.WeChatRepairReportVo;

zhsw-common/src/main/java/com/rongwei/zhsw/system/wechat/WeChatMineService.java

@@ -0,0 +1,14 @@
+package com.rongwei.zhsw.system.wechat;
+
+import com.rongwei.rwcommon.base.R;
+
+/**
+ * WeChatMineService class
+ *
+ * @author XH
+ * @date 2025/03/17
+ */
+public interface WeChatMineService {
+    R repairList();
+    R feedbackList();
+}

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/RegistrationServiceImpl.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.zhsw.system.wechat.impl;
 
 import com.rongwe.zhsw.system.domain.SwFeedBackOpinionDo;
 import com.rongwe.zhsw.system.domain.SwUserRepairDo;
@@ -11,7 +11,9 @@ import com.rongwei.rwcommoncomponent.file.dto.ImageScaleDto;
 import com.rongwei.rwcommoncomponent.file.service.impl.SysFileItemServiceImpl;
 import com.rongwei.rwcommoncomponent.file.utils.FileUtil;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
-import com.rongwei.zhsw.system.service.RegistrationService;
+import com.rongwei.zhsw.system.service.impl.SwFeedBackOpinionServiceImpl;
+import com.rongwei.zhsw.system.service.impl.SwUserRepairServiceImpl;
+import com.rongwei.zhsw.system.wechat.RegistrationService;
 import com.rongwei.zhsw.system.utils.ZhswCommonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

zhsw-common/src/main/java/com/rongwei/zhsw/system/wechat/impl/WeChatMineServiceImpl.java

@@ -0,0 +1,58 @@
+package com.rongwei.zhsw.system.wechat.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rongwe.zhsw.system.domain.SwUserRepairDo;
+import com.rongwei.rwcommon.base.BaseDo;
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommoncomponent.file.service.impl.SysFileItemServiceImpl;
+import com.rongwei.zhsw.system.service.impl.SwFeedBackOpinionServiceImpl;
+import com.rongwei.zhsw.system.service.impl.SwUserRepairServiceImpl;
+import com.rongwei.zhsw.system.utils.WeChatUtils;
+import com.rongwei.zhsw.system.utils.ZhswCommonUtils;
+import com.rongwei.zhsw.system.wechat.WeChatMineService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * WeChatMineServiceImpl class
+ *
+ * @author XH
+ * @date 2025/03/17
+ */
+@Service
+public class WeChatMineServiceImpl implements WeChatMineService {
+    @Autowired
+    private SwUserRepairServiceImpl swUserRepairService;
+    @Autowired
+    private SwFeedBackOpinionServiceImpl swFeedBackOpinionService;
+
+    @Override
+    public R repairList() {
+        String currentWeChatOpenId = WeChatUtils.getCurrentWeChatOpenId();
+        List<SwUserRepairDo> list = swUserRepairService.list(new LambdaQueryWrapper<SwUserRepairDo>()
+                .eq(BaseDo::getDeleted, "0")
+                .eq(BaseDo::getCreateuserid, currentWeChatOpenId)
+                .orderByDesc(BaseDo::getCreatedate));
+        // 对附件信息数据进行处理
+        list.forEach(data->{
+            String images = data.getImages();
+            if(StringUtils.isBlank(images)){
+                return;
+            }
+            String imgIds = Arrays.stream(images.split("\\^_\\^")).map(img -> img.split("-;-")[1]).collect(Collectors.joining(","));
+            data.setImages(imgIds);
+        });
+        return R.ok(list);
+    }
+
+    @Override
+    public R feedbackList() {
+        String currentWeChatOpenId = WeChatUtils.getCurrentWeChatOpenId();
+        return null;
+    }
+}

zhsw-entity/src/main/java/com/rongwe/zhsw/system/domain/SwFeedBackOpinionDo.java

@@ -0,0 +1,110 @@
+package com.rongwe.zhsw.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 意见反馈
+ * @TableName sw_feed_back_opinion
+ */
+@TableName(value ="sw_feed_back_opinion")
+@Data
+public class SwFeedBackOpinionDo extends BaseDo {
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 反馈编号
+     */
+    private String feedbackno;
+
+    /**
+     * 申报户号
+     */
+    private String declaccnum;
+
+    /**
+     * 户名
+     */
+    private String accountname;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 反馈人
+     */
+    private String feedbackperson;
+
+    /**
+     * 联系电话
+     */
+    private String contactnumber;
+
+    /**
+     * 意见说明
+     */
+    private String replynote;
+
+    /**
+     * 回复时间
+     */
+    private Date replytime;
+
+    /**
+     * 分类（投诉，建议）
+     */
+    private String category;
+
+    /**
+     * 文件
+     */
+    private String file;
+
+    /**
+     * 反馈来源
+     */
+    private String feedbacksource;
+
+    /**
+     * 回复人
+     */
+    private String replyperson;
+
+    /**
+     * 回复人ID
+     */
+    private String replypersonid;
+
+    /**
+     * 联系人
+     */
+    private String contactperson;
+
+    /**
+     * 提出时间
+     */
+    private Date feedbacktime;
+
+    /**
+     * 是否完成（1：是2：否）
+     */
+    private String iscompleted;
+}

zhsw-server/src/main/java/com/rongwei/zhsw/system/controller/weChat/RegistrationController.java

@@ -7,11 +7,10 @@ package com.rongwei.zhsw.system.controller.weChat;
  * @date 2025/03/16
  */
 
-import com.rongwe.zhsw.system.vo.BillListSearchVo;
 import com.rongwe.zhsw.system.vo.WeChatFeedbackReportVo;
 import com.rongwe.zhsw.system.vo.WeChatRepairReportVo;
 import com.rongwei.rwcommon.base.R;
-import com.rongwei.zhsw.system.service.RegistrationService;
+import com.rongwei.zhsw.system.wechat.RegistrationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zhsw-server/src/main/java/com/rongwei/zhsw/system/controller/weChat/WeChatMineController.java

@@ -0,0 +1,35 @@
+package com.rongwei.zhsw.system.controller.weChat;
+
+import com.rongwe.zhsw.system.vo.WeChatFeedbackReportVo;
+import com.rongwe.zhsw.system.vo.WeChatRepairReportVo;
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.zhsw.system.wechat.impl.WeChatMineServiceImpl;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * WeChatMineController class
+ *
+ * @author XH
+ * @date 2025/03/17
+ */
+@RestController
+@RequestMapping("/wechat/mine")
+public class WeChatMineController {
+
+    @Autowired
+    private WeChatMineServiceImpl weChatMineService;
+
+    @PostMapping("/repair")
+    private R repairRegistration() {
+        return weChatMineService.repairList();
+    }
+    @PostMapping("/feedback")
+    private R feedbackRegistration() {
+        return weChatMineService.feedbackList();
+    }
+}