合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -218,5 +218,35 @@ public class UserController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "获取用户反馈信息", notes = "获取用户反馈信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "content", value = "反馈内容"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "tel", value = "手机号"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "handleStatus", value = "1 是已处理 2是未处理 3 是正在处理"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "当前页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "一页多少行"),
+    })
+    @RequestMapping(value = "/user/feedback", method = RequestMethod.GET)
+    public ResponseBean feedback(HttpSession session,
+                                     @RequestParam(value = "content", required = false) String content,
+                                     @RequestParam(value = "tel", required = false)String tel,
+                                     @RequestParam(value = "handleStatus", required = false)String handleStatus,
+                                     @RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
+                                     @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iToUserService.feedback(userElement,content,tel,handleStatus,pageNum,pageSize);
+        return responseBean;
+    }
+
 
+    @ApiOperation(value = "修改当前状态", notes = "修改当前状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id[],handleStatus:状态，handleRemark：备注"),
+    })
+    @RequestMapping(value = "/user/updfeedback", method = RequestMethod.POST)
+    public ResponseBean feedbackEdit(HttpSession session,@RequestBody String parameter){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iToUserService.updfeedback(userElement,parameter);
+        return responseBean;
+    }
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/IToUserService.java

@@ -109,4 +109,24 @@ public interface IToUserService {
      * @return
      */
     ResponseBean operatedel(UserElement userElement, String parameter);
+
+    /**
+     *反馈信息
+     * @param userElement
+     * @param content
+     * @param tel
+     * @param handleStatus
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean feedback(UserElement userElement, String content, String tel, String handleStatus, Integer pageNum, Integer pageSize);
+
+    /**
+     * 处理消息
+     * @param userElement
+     * @param parameter
+     * @return
+     */
+    ResponseBean updfeedback(UserElement userElement, String parameter);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -46,6 +46,12 @@ public class ToUserServerImpl implements IToUserService {
     @Autowired
     private ToOperateTelMapper toOperateTelMapper;
 
+    @Autowired
+    private TaFeedbackMapper taFeedbackMapper;
+
+    @Autowired
+    private TaFeedbackImgMapper taFeedbackImgMapper;
+
     @Override
     public ResponseBean login(String loginName, String code) {
 
@@ -387,6 +393,42 @@ public class ToUserServerImpl implements IToUserService {
         return responseBean;
     }
 
+    @Override
+    public ResponseBean feedback(UserElement userElement, String content, String tel, String handleStatus, Integer pageNum, Integer pageSize) {
+        ResponseBean response= new ResponseBean<>();
+        Page<TaFeedback> page = PageHelper.startPage(pageNum,pageSize);
+        List<TaFeedback> phoneList = taFeedbackMapper.getFeedback(content, tel, handleStatus);
+        for (TaFeedback taFeedback : phoneList){
+             List<String> String= taFeedbackImgMapper.selectImg(taFeedback.getId());
+        }
+
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("item",phoneList);
+        map.put("total",page.getTotal());
+        response.addSuccess(map);
+        return response;
+    }
+
+    @Override
+    public ResponseBean updfeedback(UserElement userElement, String parameter) {
+        ResponseBean response = new ResponseBean<>();
+        JSONObject object= JSONObject.parseObject(parameter);
+        String handleStatus= object.getString("handleStatus");
+        String handleRemark= object.getString("handleRemark");
+        Integer[] arr = object.getJSONArray("id").toArray(new Integer[]{});
+        for (Integer id:arr){
+            TaFeedback taFeedback = new TaFeedback();
+                       taFeedback.setId(id);
+                       taFeedback.setHandleStatus(handleStatus);
+                       taFeedback.setHandleRemark(handleRemark);
+            taFeedback.setHandleTime(new Date());
+                       taFeedback.setUpdateDate(new Date());
+            taFeedbackMapper.updateByPrimaryKeySelective(taFeedback);
+        }
+        response.addSuccess("成功");
+        return response;
+    }
+
     //查询多个角色转换为字符串
     public String selectRole(Integer id) {
         List<ToUser> toUser= toUserMapper.selectRole(id);

VUECODE/smart-operate-manage/src/api/user.js

@@ -103,4 +103,30 @@ export function blacklistUser(data) {
     data
   })
 }
+// 获取当前反馈
+export function feedback(data) {
+  return request({
+    url: '/user/feedback',
+    method: 'get',
+    params: {
+      content: data.content, // 反馈内容
+      tel: data.tel, // 手机号
+      handleStatus: data.handleStatus,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
+    }
+  })
+}
+// 修改当前反馈状态
+export function updfeedback(data) {
+  return request({
+    url: '/user/updfeedback',
+    method: 'post',
+    data: {
+      id: data.allId,
+      handleStatus: data.handleStatus,
+      handleRemark: data.handleRemark
+    }
+  })
+}
 

VUECODE/smart-operate-manage/src/router/index.js

@@ -85,6 +85,12 @@ export const constantRouterMap = [
         name: 'banner-info',
         hidden: true,
         meta: { title: '查看banner', icon: 'table' }
+      },
+      {
+        path: '/banner/feedback',
+        component: () => import('@/views/banner/feedback/index'),
+        name: 'feedback-info',
+        meta: { title: '用户反馈', icon: 'table' }
       }
     ]
   },

VUECODE/smart-operate-manage/src/store/modules/user.js

@@ -1,6 +1,6 @@
 import { login, logOut, getInfo, sendCode } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
-import { employeesList, userRoleById, addUser, selectUser, upDate, upDateStatus, getTaUserAll, blacklistUser } from '@/api/user'
+import { employeesList, userRoleById, addUser, selectUser, upDate, upDateStatus, getTaUserAll, blacklistUser, feedback, updfeedback } from '@/api/user'
 
 const user = {
   state: {
@@ -179,6 +179,24 @@ const user = {
           reject(error)
         })
       })
+    },
+    Feedback({ commit }, data) { // 拉黑移动端用户
+      return new Promise((resolve, reject) => {
+        feedback(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    Updfeedback({ commit }, data) { // 拉黑移动端用户
+      return new Promise((resolve, reject) => {
+        updfeedback(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }