后端代码更新[新加故障处理功能]+其他代码调整

light-application-server/sql/biz.sql

@@ -93,44 +93,6 @@ CREATE TABLE `notice_info`
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = INNODB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '公告管理' ROW_FORMAT = DYNAMIC;
 
-DROP TABLE IF EXISTS `crowd_info`;
-CREATE TABLE `crowd_info`
-(
-    `id`               bigint(20) NOT NULL AUTO_INCREMENT,
-    `name`             varchar(128) DEFAULT NULL COMMENT '群聊名称',
-    `remark`           text         DEFAULT NULL COMMENT '群聊简介',
-    `create_personnel` varchar(16)  DEFAULT NULL COMMENT '创建人',
-    `qr_code_url`      varchar(512) DEFAULT NULL COMMENT '群聊二维码地址',
-    `create_time`      datetime     DEFAULT NULL COMMENT '创建时间',
-    `update_time`      datetime     DEFAULT NULL COMMENT '修改时间',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = INNODB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '群聊表' ROW_FORMAT = DYNAMIC;
-
-DROP TABLE IF EXISTS `crowd_user`;
-CREATE TABLE `crowd_user`
-(
-    `id`          bigint(20) NOT NULL AUTO_INCREMENT,
-    `crowd_id`    bigint(20) DEFAULT NULL COMMENT '群聊id',
-    `user_id`     bigint(20) DEFAULT NULL COMMENT '用户id',
-    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = INNODB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '群聊&用户关系表' ROW_FORMAT = DYNAMIC;
-
-DROP TABLE IF EXISTS `message_record`;
-CREATE TABLE `message_record`
-(
-    `id`            bigint(20) NOT NULL AUTO_INCREMENT,
-    `send_id`       bigint(20) DEFAULT NULL COMMENT '发送方用户id',
-    `send_name`     varchar(128) DEFAULT NULL COMMENT '发送方用户名称',
-    `receive_id`    bigint(20) DEFAULT NULL COMMENT '接收方id（可以为用户or群聊）',
-    `receive_name`  varchar(128) DEFAULT NULL COMMENT '接收方名称（可以为用户or群聊）',
-    `type`          int(4) DEFAULT NULL COMMENT '消息类型（10：文本，20：图片，30：视频）',
-    `content`       varchar(512) DEFAULT NULL COMMENT '消息内容',
-    `resources_url` varchar(512) DEFAULT NULL COMMENT '资源地址',
-    `create_time`   datetime     DEFAULT NULL COMMENT '创建时间',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = INNODB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '消息记录表' ROW_FORMAT = DYNAMIC;
-
 DROP TABLE IF EXISTS `inspection_project`;
 CREATE TABLE `inspection_project`
 (
@@ -147,7 +109,7 @@ CREATE TABLE `inspection_template`
     `id`          bigint(20) NOT NULL AUTO_INCREMENT,
     `name`        varchar(128) DEFAULT NULL COMMENT '模板名称',
     `type`        int(2) DEFAULT NULL COMMENT '模板类型 10：日常巡检 20：会议巡检',
-    `is_enable`        int(2) DEFAULT NULL COMMENT '是否启用 10：启用 20：禁用',
+    `is_enable`   int(2) DEFAULT NULL COMMENT '是否启用 10：启用 20：禁用',
     `create_time` datetime     DEFAULT NULL COMMENT '创建时间',
     `update_time` datetime     DEFAULT NULL COMMENT '修改时间',
     PRIMARY KEY (`id`) USING BTREE
@@ -163,3 +125,18 @@ CREATE TABLE `inspection_template_project`
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '巡检模板&巡检项目关联表' ROW_FORMAT = DYNAMIC;
 
+DROP TABLE IF EXISTS `fault_handling_record`;
+CREATE TABLE `fault_handling_record`
+(
+    `id`                  bigint(20) NOT NULL AUTO_INCREMENT,
+    `title`               varchar(128) DEFAULT NULL COMMENT '故障标题',
+    `content`             varchar(512) DEFAULT NULL COMMENT '故障内容',
+    `treatment_method`    varchar(512) DEFAULT NULL COMMENT '处理方式',
+    `treatment_personnel` varchar(512) DEFAULT NULL COMMENT '处理人员',
+    `propose_personnel`   varchar(512) DEFAULT NULL COMMENT '提出人员',
+    `status`              int(2) DEFAULT NULL COMMENT '10：未处理 20：已处理',
+    `create_time`         datetime     DEFAULT NULL COMMENT '创建时间',
+    `update_time`         datetime     DEFAULT NULL COMMENT '修改时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = INNODB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '故障处理记录' ROW_FORMAT = DYNAMIC;
+

light-application-server/src/main/java/com/jd/lightapplication/config/SecurityConfig.java

@@ -70,12 +70,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
             "/logout",
             "/captcha",
             "/favicon.ico",
-            "/api/sms/**",
             "/webjars/**",//接口文档地址
             "/swagger-resources/**",//接口文档地址
             "/doc.html",//接口文档地址
             "/v3/api-docs",//接口文档地址
-            "/api/easemob/**"//环信接口
+            "/api/easemob/**",//环信接口
+            "/showfile/**"
     };
 
     protected void configure(HttpSecurity http) throws Exception {

light-application-server/src/main/java/com/jd/lightapplication/controller/AuthController.java

@@ -108,6 +108,7 @@ public class AuthController extends BaseController {
                 .put("id", sysUser.getId())
                 .put("usernameShow", sysUser.getUsernameShow())
                 .put("nickName",sysUser.getNickName())
+                .put("phone",sysUser.getPhone())
                 .put("headImgUrl",sysUser.getHeadImgUrl())
                 .put("created", sysUser.getCreated())
                 .put("roleList",roleList)

light-application-server/src/main/java/com/jd/lightapplication/controller/FaultHandlingRecordController.java

@@ -0,0 +1,66 @@
+package com.jd.lightapplication.controller;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jd.lightapplication.common.lang.R;
+import com.jd.lightapplication.model.FaultHandlingRecord;
+import com.jd.lightapplication.service.FaultHandlingRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import javax.annotation.Resource;
+
+
+@Slf4j
+@RestController()
+@RequestMapping("/api/fault/handling/record")
+@Api(tags = "故障处理记录")
+public class FaultHandlingRecordController {
+
+    @Resource
+    private FaultHandlingRecordService faultHandlingRecordService;
+
+    @GetMapping("/list")
+    @ApiOperation(value = "1、分页查询")
+    public R queryPageBean(Page page, FaultHandlingRecord faultHandlingRecord) {
+        LambdaQueryWrapper<FaultHandlingRecord> wrapper = new LambdaQueryWrapper<>();
+        if (StrUtil.isNotBlank(faultHandlingRecord.getTitle())) {
+            wrapper.like(FaultHandlingRecord::getTitle, faultHandlingRecord.getTitle());
+        }
+        wrapper.orderByDesc(FaultHandlingRecord::getCreateTime);
+        wrapper.orderByAsc(FaultHandlingRecord::getStatus);
+        return R.success(faultHandlingRecordService.page(page, wrapper));
+    }
+
+    @PostMapping("/addBean")
+    @ApiOperation(value = "2、新增")
+    public R addBean(@RequestBody FaultHandlingRecord faultHandlingRecord) {
+        faultHandlingRecord.setStatus(10);
+        faultHandlingRecord.setCreateTime(DateUtil.now());
+        faultHandlingRecordService.save(faultHandlingRecord);
+        return R.success();
+    }
+
+    @PostMapping("/updateBean")
+    @ApiOperation(value = "3、修改")
+    public R updateBean(@RequestBody FaultHandlingRecord faultHandlingRecord) {
+        //如果处理时间不为空，把状态改成已处理
+        if(StrUtil.isNotBlank(faultHandlingRecord.getUpdateTime())){
+            faultHandlingRecord.setStatus(20);
+        }
+        faultHandlingRecordService.updateById(faultHandlingRecord);
+        return R.success();
+    }
+
+    @PostMapping("/deleteById")
+    @ApiOperation(value = "4、删除")
+    public R deleteById(long id) {
+        faultHandlingRecordService.removeById(id);
+        return R.success();
+    }
+
+}

light-application-server/src/main/java/com/jd/lightapplication/controller/InspectionRecordController.java

@@ -51,7 +51,7 @@ public class InspectionRecordController {
         return R.success();
     }
 
-    @PostMapping("/queryDetails")
+    @GetMapping("/queryDetails")
     @ApiOperation(value = "5、根据巡检记录id查询巡检详情")
     public R queryDetails(long id) {
         return R.success(inspectionRecordService.queryDetails(id));

light-application-server/src/main/java/com/jd/lightapplication/easemob/EasemobComtroller.java

@@ -40,9 +40,12 @@ public class EasemobComtroller {
     private final String DELETE_GROUP_URL = "http://a1.easemob.com/%s/%s/chatgroups/%s";//删除群组
     private final String QUERY_GROUP_PAGE_URL = "http://a1.easemob.com/%s/%s/chatgroups";//分页查询群组
     private final String QUERY_GROUP_DETAILS_URL = "http://a1.easemob.com/%s/%s/chatgroups/%s";//查询群组详情
+    private final String QUERY_GROUP_USER_URL = "http://a1.easemob.com/%s/%s/chatgroups/%s/users";//查询群组内所有成员
     private final String ADD_GROUP_USER_URL = "http://a1.easemob.com/%s/%s/chatgroups/%s/users";//批量添加群组成员
+    private final String DELETE_GROUP_USER_URL = "http://a1.easemob.com/%s/%s/chatgroups/%s/users/%s";//批量移除群组成员
     private final String SET_USER_ATTRIBUTE_URL = "http://a1.easemob.com/%s/%s/metadata/user/%s";//设置环信用户属性
     private final String GET_USER_ATTRIBUTE_URL = "http://a1.easemob.com/%s/%s/metadata/user/%s";//获取环信用户属性
+    private final String GET_USER_ATTRIBUTE_BATH_URL = "http://a1.easemob.com/%s/%s/metadata/user/get";//获取环信用户属性批量
 
     @PostMapping("/getToken")
     @ApiOperation("获取环信token接口")
@@ -63,7 +66,7 @@ public class EasemobComtroller {
         //获取响应参数
         String result = HttpRequest.post(tokenUrl)
                 .header("Accept", "application/json")
-                .body(JSONUtil.parse(params).toString(),"application/json")
+                .body(JSONUtil.parse(params).toString(), "application/json")
                 .execute()
                 .body();
         JSONObject resultJsonObj = JSONUtil.parseObj(result);
@@ -90,35 +93,13 @@ public class EasemobComtroller {
         String result = HttpRequest.post(url)
                 .header("Accept", "application/json")
                 .header("Authorization", "Bearer " + easemobTokenStr)
-                .body(JSONUtil.parse(params).toString(),"application/json")
+                .body(JSONUtil.parse(params).toString(), "application/json")
                 .execute()
                 .body();
         JSONObject jsonObject = JSONUtil.parseObj(result);
         return R.success(jsonObject);
     }
 
-    @PostMapping("/queryUserPage")
-    @ApiOperation("分页查询环信用户")
-    public R queryUserPage(QueryPageDto queryPageDto) {
-        //获取环信token
-        String easemobTokenStr = this.getToken().getData().toString();
-        //拼接请求路径
-        String url = String.format(QUERY_USER_PAGE_URL, ORG_NAME, APP_NAME);
-        //封装请求参数
-        Map<String, Object> params = new HashMap<>();
-        new MapBuilder<>(params)
-                .put("limit", queryPageDto.getLimit())
-                .put("cursor", queryPageDto.getCursor())
-                .map();
-        String result = HttpRequest.get(url)
-                .header("Authorization", "Bearer " + easemobTokenStr)
-                .form(params)
-                .execute()
-                .body();
-        JSONObject resultJsonObj = JSONUtil.parseObj(result);
-        return R.success(resultJsonObj);
-    }
-
     @GetMapping("/queryGroupPage")
     @ApiOperation("分页查询环信应用内的群组")
     public R queryGroupPage(QueryPageDto queryPageDto) {
@@ -236,13 +217,43 @@ public class EasemobComtroller {
         String result = HttpRequest.post(url)
                 .header("Accept", "application/json")
                 .header("Authorization", "Bearer " + easemobTokenStr)
-                .body(JSONUtil.parse(params).toString(),"application/json")
+                .body(JSONUtil.parse(params).toString(), "application/json")
                 .execute()
                 .body();
         JSONObject jsonObject = JSONUtil.parseObj(result);
         return R.success(jsonObject);
     }
 
+    @GetMapping("/queryGroupUser")
+    @ApiOperation("查询群组内所有的用户")
+    public R queryGroupUser(String groupId) {
+        //获取环信token
+        String easemobTokenStr = this.getToken().getData().toString();
+        //拼接请求路径
+        String url = String.format(QUERY_GROUP_USER_URL, ORG_NAME, APP_NAME, groupId);
+        String result = HttpRequest.get(url)
+                .header("Authorization", "Bearer " + easemobTokenStr)
+                .execute()
+                .body();
+        JSONObject resultJsonObj = JSONUtil.parseObj(result);
+        return R.success(resultJsonObj);
+    }
+
+    @DeleteMapping("/removeGroupUser/{groupId}")
+    @ApiOperation("批量删除群组内的用户")
+    public R removeGroupUser(@PathVariable("groupId") String groupId, String usernames) {
+        //获取环信token
+        String easemobTokenStr = this.getToken().getData().toString();
+        //拼接请求路径
+        String url = String.format(DELETE_GROUP_USER_URL, ORG_NAME, APP_NAME, groupId, usernames);
+        String result = HttpRequest.delete(url)
+                .header("Authorization", "Bearer " + easemobTokenStr)
+                .execute()
+                .body();
+        JSONObject resultJsonObj = JSONUtil.parseObj(result);
+        return R.success(resultJsonObj);
+    }
+
     @PostMapping("/setUpUserAttribute")
     @ApiOperation("设置环信用户属性")
     public R setUpUserAttribute(@RequestBody SetUserAttributeDto setUserAttributeDto) {
@@ -286,4 +297,47 @@ public class EasemobComtroller {
         JSONObject jsonObject = JSONUtil.parseObj(result);
         return R.success(jsonObject);
     }
+
+    @PostMapping("/getUpUserAttributeBath")
+    @ApiOperation("获取环信用户属性(批量)")
+    public R getUpUserAttributeBath(@RequestBody GetUpUserAttributeBathDto getUpUserAttributeBathDto) {
+        //获取环信token
+        String easemobTokenStr = this.getToken().getData().toString();
+        //拼接请求路径
+        String url = String.format(GET_USER_ATTRIBUTE_BATH_URL, ORG_NAME, APP_NAME);
+        //封装请求参数
+        Map<Object, Object> params = MapUtil.builder()
+                .put("properties", getUpUserAttributeBathDto.getProperties())
+                .put("targets", getUpUserAttributeBathDto.getTargets())
+                .map();
+        String result = HttpRequest.get(url)
+                .header("Authorization", "Bearer " + easemobTokenStr)
+                .body(JSONUtil.parse(params).toString(), "application/json")
+                .execute()
+                .body();
+        JSONObject jsonObject = JSONUtil.parseObj(result);
+        return R.success(jsonObject);
+    }
+
+    @PostMapping("/queryUserPage")
+    @ApiOperation("分页查询环信用户")
+    public R queryUserPage(QueryPageDto queryPageDto) {
+        //获取环信token
+        String easemobTokenStr = this.getToken().getData().toString();
+        //拼接请求路径
+        String url = String.format(QUERY_USER_PAGE_URL, ORG_NAME, APP_NAME);
+        //封装请求参数
+        Map<String, Object> params = new HashMap<>();
+        new MapBuilder<>(params)
+                .put("limit", queryPageDto.getLimit())
+                .put("cursor", queryPageDto.getCursor())
+                .map();
+        String result = HttpRequest.get(url)
+                .header("Authorization", "Bearer " + easemobTokenStr)
+                .form(params)
+                .execute()
+                .body();
+        JSONObject resultJsonObj = JSONUtil.parseObj(result);
+        return R.success(resultJsonObj);
+    }
 }

light-application-server/src/main/java/com/jd/lightapplication/easemob/dto/GetUpUserAttributeBathDto.java

@@ -0,0 +1,14 @@
+package com.jd.lightapplication.easemob.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GetUpUserAttributeBathDto {
+    @ApiModelProperty("用户属性key集合")
+    private List<String>  properties;
+    @ApiModelProperty("用户username集合")
+    private List<String>  targets;
+}

light-application-server/src/main/java/com/jd/lightapplication/mapper/FaultHandlingRecordMapper.java

@@ -0,0 +1,8 @@
+package com.jd.lightapplication.mapper;
+
+import com.jd.lightapplication.model.FaultHandlingRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface FaultHandlingRecordMapper extends BaseMapper<FaultHandlingRecord>  {
+	
+}

light-application-server/src/main/java/com/jd/lightapplication/model/FaultHandlingRecord.java

@@ -0,0 +1,57 @@
+package com.jd.lightapplication.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel("故障处理记录")
+@TableName("fault_handling_record")
+public class FaultHandlingRecord implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    @ApiModelProperty("故障标题")
+    @TableField("title")
+    private String title;
+
+    @ApiModelProperty("故障内容")
+    @TableField("content")
+    private String content;
+
+    @ApiModelProperty("处理方式")
+    @TableField("treatment_method")
+    private String treatmentMethod;
+
+    @ApiModelProperty("处理人员")
+    @TableField("treatment_personnel")
+    private String treatmentPersonnel;
+
+    @ApiModelProperty("提出人员")
+    @TableField("propose_personnel")
+    private String proposePersonnel;
+
+    @ApiModelProperty("10：未处理 20：已处理")
+    @TableField("status")
+    private Integer status;
+
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private String createTime;
+
+    @ApiModelProperty("修改时间")
+    @TableField("update_time")
+    private String updateTime;
+
+}

light-application-server/src/main/java/com/jd/lightapplication/service/FaultHandlingRecordService.java

@@ -0,0 +1,14 @@
+package com.jd.lightapplication.service;
+
+import  com.jd.lightapplication.model.FaultHandlingRecord;
+import  com.jd.lightapplication.mapper.FaultHandlingRecordMapper;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class FaultHandlingRecordService extends ServiceImpl<FaultHandlingRecordMapper,FaultHandlingRecord> {
+
+}

light-application-server/src/main/java/com/jd/lightapplication/service/UploadRecordService.java

@@ -24,6 +24,10 @@ public class UploadRecordService extends ServiceImpl<UploadRecordMapper, UploadR
     @Value("${file.path}")
     private String filePath;
 
+    // 文件访问地址
+    @Value("${http.addr}")
+    private String addr;
+
     public UploadRecord upload(MultipartFile file, UploadDto uploadDto) {
         //拿到文件的名称
         String fileName = file.getOriginalFilename();
@@ -44,7 +48,7 @@ public class UploadRecordService extends ServiceImpl<UploadRecordMapper, UploadR
         }
         UploadRecord fileInfo = new UploadRecord()
                 .setSourceName(fileName)
-                .setFilePath(path + fileId)
+                .setFilePath(addr + path + fileId)
                 .setInspectionResultId(uploadDto.getInspectionResultId())
                 .setFileType(uploadDto.getFileType() == null ? 10 : uploadDto.getFileType())
                 .setUploadUserId(null)
@@ -59,7 +63,7 @@ public class UploadRecordService extends ServiceImpl<UploadRecordMapper, UploadR
     //处理文件路径
     public String handleFilePath() {
         Calendar rightNow = Calendar.getInstance();
-        return rightNow.get(Calendar.YEAR) + "/" + (rightNow.get(Calendar.MONTH) + 1) + "/" + rightNow.get(Calendar.DAY_OF_MONTH) + "/";
+        return "showfile/" + rightNow.get(Calendar.YEAR) + "/" + (rightNow.get(Calendar.MONTH) + 1) + "/" + rightNow.get(Calendar.DAY_OF_MONTH) + "/";
     }
 
     public Boolean updateBatch(List<Integer> fileIds, Long inspectionResultId) {

light-application-server/src/main/resources/application.yml

@@ -27,6 +27,16 @@ spring:
     multipart:
       max-file-size: 100MB
       max-request-size: 100MB
+
+  web:
+    resources:
+      static-locations: file:${file.path},classpath:/static/
+
+file:
+  #文件保存的目录路径
+  path: "D:/files/"
+http:
+  addr: https://miniapp.cqjudong.com/base/
 #  security:
 #    user:
 #      name: user
@@ -55,10 +65,6 @@ sms:
   sms_url: http://112.35.1.155:1992/sms/norsubmit
   sms_content: "重庆市城市管理局温馨提示：您正在{doing}，验证码为：{yzm}，该验证码10分钟有效，请勿泄露给他人。"
 
-file:
-  #文件保存的目录路径
-  path: "D:/files/"
-
 weChat:
   appId: wxc4466f468dcf82a5
   appSecret: b8b63b8d5bd3c1d18d450109bde3f0b2

light-application-server/src/main/resources/mapper/FaultHandlingRecordMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.jd.lightapplication.mapper.FaultHandlingRecordMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+   <resultMap type="com.jd.lightapplication.model.FaultHandlingRecord" id="faultHandlingRecordMap">
+        <result property="id" column="id"/>
+        <result property="title" column="title"/>
+        <result property="content" column="content"/>
+        <result property="treatmentMethod" column="treatment_method"/>
+        <result property="treatmentPersonnel" column="treatment_personnel"/>
+        <result property="proposePersonnel" column="propose_personnel"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+</mapper>