feats

src/main/java/com/example/civilizedcity/common/Constants.java

@@ -57,7 +57,8 @@ public class Constants {
 
     // 流程起始: 待交办
     public final static String PROCESS_START = "start";
-    public final static String PROCESS_RESTART = "restart";
+    // 流程: 被打回 - 市民提交
+    public final static String PROCESS_REJECT = "reject";
 
     // 审核
     public final static String PROCESS_VERIFY = "verify";

src/main/java/com/example/civilizedcity/controller/StatController.java

@@ -0,0 +1,48 @@
+package com.example.civilizedcity.controller;
+
+import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.ResponseBean;
+import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.entity.TaPerson;
+import com.example.civilizedcity.service.TaIssueService;
+import com.example.civilizedcity.vo.StatVo;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 查询统计
+ */
+@RestController
+public class StatController extends BaseController {
+
+    @Autowired
+    TaIssueService taIssueService;
+
+    @ApiOperation("小程序首页查询统计")
+    @GetMapping("/ma/index-stat")
+    public ResponseBean getMaIndex(@ApiParam("身份") @RequestParam(value = "duty", required = false) String duty) throws Exception {
+        SysUser user = null;
+        TaPerson person = null;
+
+        try {
+            user = currentUser();
+        } catch (Exception e) {
+            //
+        }
+        try {
+            person = currentPerson();
+        } catch (Exception e) {
+            //
+        }
+
+        List<StatVo> result = taIssueService.statMaIndex(user, duty);
+
+        return ResponseBean.success(result);
+    }
+}

src/main/java/com/example/civilizedcity/controller/SysUserController.java

@@ -16,6 +16,7 @@ import com.example.civilizedcity.entity.SysResource;
 import com.example.civilizedcity.entity.SysRole;
 import com.example.civilizedcity.service.SysResourceService;
 import com.example.civilizedcity.service.SysRoleService;
+import com.example.civilizedcity.service.SysUserDutyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -24,8 +25,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.service.SysUserService;
 
- /**
+/**
  * 用户表;(sys_user)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
@@ -35,13 +37,16 @@ import com.example.civilizedcity.service.SysUserService;
 public class SysUserController extends BaseController {
 
     @Autowired
-     SysRoleService sysRoleService;
+    SysRoleService sysRoleService;
 
     @Autowired
-     SysResourceService sysResourceService;
+    SysResourceService sysResourceService;
 
-    /** 
-     * 通过ID查询单条数据 
+    @Autowired
+    SysUserDutyService sysUserDutyService;
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param userId 主键
      * @return 实例对象
@@ -57,33 +62,35 @@ public class SysUserController extends BaseController {
         return ResponseBean.success(getPermissions(sysUser));
     }
 
-     /**
-      * 查询当前人员
-      *
-      * @param
-      * @return 实例对象
-      */
-     @ApiOperation("查询当前人员")
-     @GetMapping("/sysUser/current")
-     public ResponseBean current() throws Exception {
-         SysUser sysUser = currentUser();
-         return ResponseBean.success(getPermissions(sysUser));
-     }
-
-     private SysUser getPermissions(SysUser sysUser) {
-         List<SysRole> rolesList = sysRoleService.getByUser(sysUser.getUserId());
-         List<SysResource> resourcesList = sysResourceService.getByUser(sysUser.getUserId());
-
-         sysUser.setRolesList(rolesList);
-         sysUser.setResourcesList(resourcesList);
-
-         return sysUser;
-     }
-    
-    /** 
+    /**
+     * 查询当前人员
+     *
+     * @param
+     * @return 实例对象
+     */
+    @ApiOperation("查询当前人员")
+    @GetMapping("/sysUser/current")
+    public ResponseBean current() throws Exception {
+        SysUser sysUser = currentUser();
+        return ResponseBean.success(getPermissions(sysUser));
+    }
+
+    private SysUser getPermissions(SysUser sysUser) {
+        List<SysRole> rolesList = sysRoleService.getByUser(sysUser.getUserId());
+        List<SysResource> resourcesList = sysResourceService.getByUser(sysUser.getUserId());
+        List<String> dutyList = sysUserDutyService.getListByUser(sysUser.getUserId());
+
+        sysUser.setRolesList(rolesList);
+        sysUser.setResourcesList(resourcesList);
+        sysUser.setDutyList(dutyList);
+
+        return sysUser;
+    }
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
@@ -94,7 +101,7 @@ public class SysUserController extends BaseController {
                              @ApiParam("姓名") @RequestParam(value = "name", required = false) String name,
                              @ApiParam("机构") @RequestParam(value = "orgId", required = false) String orgId,
                              @ApiParam("手机号") @RequestParam(value = "phone", required = false) String phone) throws Exception {
-        
+
         IPage<SysUser> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
@@ -104,11 +111,11 @@ public class SysUserController extends BaseController {
         queryWrapper.ne("user_id", Constants.ROOT_ID);
         queryWrapper.orderByDesc("create_date");
         IPage<SysUser> result = sysUserService.page(pg, queryWrapper);
-        
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param sysUser 实例对象
@@ -125,24 +132,24 @@ public class SysUserController extends BaseController {
         return ResponseBean.success(sysUser);
     }
 
-     /**
-      * 更新数据
-      *
-      * @param id 实例ID
-      * @return 实例对象
-      */
-     @ApiOperation("更新数据")
-     @PutMapping("/sysUser/{id}/status")
-     public ResponseBean edit(@ApiParam("对象ID") @PathVariable String id,
-                              @ApiParam("页码") @RequestParam(value = "status") Integer status) throws Exception {
-
-         SysUser sysUser = sysUserService.getById(id);
-         sysUser.setStatus(status);
-
-         sysUserService.updateById(sysUser);
-         return ResponseBean.success(sysUser);
-     }
-    
+    /**
+     * 更新数据
+     *
+     * @param id 实例ID
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @PutMapping("/sysUser/{id}/status")
+    public ResponseBean edit(@ApiParam("对象ID") @PathVariable String id,
+                             @ApiParam("页码") @RequestParam(value = "status") Integer status) throws Exception {
+
+        SysUser sysUser = sysUserService.getById(id);
+        sysUser.setStatus(status);
+
+        sysUserService.updateById(sysUser);
+        return ResponseBean.success(sysUser);
+    }
+
 //    /**
 //     * 更新数据
 //     *
@@ -156,8 +163,8 @@ public class SysUserController extends BaseController {
 //        sysUserService.updateById(sysUser);
 //        return ResponseBean.success(sysUser);
 //    }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param userId 主键
@@ -165,7 +172,7 @@ public class SysUserController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/sysUser/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         sysUserService.removeLogicById(id);
         return ResponseBean.success("success");
     }

src/main/java/com/example/civilizedcity/entity/SysUserDuty.java

@@ -25,7 +25,7 @@ public class SysUserDuty implements Serializable,Cloneable{
      /** 用户ID */
      @ApiModelProperty(name = "ID",notes = "")
      @TableId(value = "id", type = IdType.AUTO)
-     private String id ;
+     private Integer id ;
     /** 用户ID */
     @ApiModelProperty(name = "用户ID",notes = "")
     private String userId ;

src/main/java/com/example/civilizedcity/mapper/SysUserDutyMapper.java

@@ -17,4 +17,7 @@ public interface SysUserDutyMapper  extends BaseMapper<SysUserDuty>{
 
      List<String> getListByUser(@Param("userId") String userId);
 
+    SysUserDuty getByUserAndDuty(@Param("userId") String userId, @Param("duty") String duty);
+
+    int deleteNotIn(@Param("userId") String userId, @Param("idList") List<Integer> idList);
 }

src/main/java/com/example/civilizedcity/mapper/TaIssueMapper.java

@@ -2,11 +2,14 @@ package com.example.civilizedcity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaIssue;
 
- /**
+import java.util.Map;
+
+/**
  * 问题表;(ta_issue)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
@@ -23,4 +26,7 @@ public interface TaIssueMapper  extends BaseMapper<TaIssue>{
                      @Param("applyId") Integer applyId);
 
      int updateValidateStatus(@Param("issueId") Integer issueId, @Param("validateStatus") int validateStatus);
+
+     @MapKey("id")
+     Map<String, Object> statMaIndex(@Param("userId") String userId);
  }

src/main/java/com/example/civilizedcity/mapper/TaOrgIssueMapper.java

@@ -3,11 +3,14 @@ package com.example.civilizedcity.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.entity.TaIssue;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaOrgIssue;
 
- /**
+import java.util.Map;
+
+/**
  * 单位问题单;(ta_org_issue)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-28
@@ -23,4 +26,7 @@ public interface TaOrgIssueMapper  extends BaseMapper<TaOrgIssue>{
      );
 
      TaOrgIssue getByIssueAndOrg(@Param("issueId") Integer issueId, @Param("orgId") String orgId);
+
+     @MapKey("id")
+     Map<String, Object> statMaIndex(@Param("orgId") String orgId);
  }

src/main/java/com/example/civilizedcity/service/TaIssueService.java

@@ -2,9 +2,13 @@ package com.example.civilizedcity.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.vo.StatVo;
 
- /**
+import java.util.List;
+
+/**
  * 问题表;(ta_issue)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
@@ -16,4 +20,6 @@ public interface TaIssueService extends IBaseService<TaIssue> {
      void updateValidateStatus(Integer issueId, int validateStatus);
 
      void updateApply(Integer issueId, String applyType, Integer applyId);
+
+     List<StatVo> statMaIndex(SysUser user, String duty);
  }

src/main/java/com/example/civilizedcity/service/impl/SysUserServiceImpl.java

@@ -3,9 +3,7 @@ package com.example.civilizedcity.service.impl;
 import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.EncryptUtils;
 import com.example.civilizedcity.common.StringUtils;
-import com.example.civilizedcity.entity.SysLogin;
-import com.example.civilizedcity.entity.SysRole;
-import com.example.civilizedcity.entity.SysUserRole;
+import com.example.civilizedcity.entity.*;
 import com.example.civilizedcity.mapper.SysLoginMapper;
 import com.example.civilizedcity.mapper.SysUserDutyMapper;
 import com.example.civilizedcity.mapper.SysUserRoleMapper;
@@ -13,7 +11,6 @@ import com.example.civilizedcity.vo.ChangePassword;
 import com.example.civilizedcity.vo.LoginParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.mapper.SysUserMapper;
 import com.example.civilizedcity.service.SysUserService;
 
@@ -148,6 +145,33 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             sysUserRoleMapper.deleteNotIn(sysUser.getUserId(), idList);
         }
 
+        // 身份表
+        List<String> dutyList = sysUser.getDutyList();
+        if (null == dutyList || dutyList.size() == 0) {
+            sysUserDutyMapper.deleteByMap(new HashMap<String, Object>() {{
+                put("user_id", sysUser.getUserId());
+            }});
+        } else {
+            List<Integer> idList = new ArrayList<>();
+            for (String duty : dutyList) {
+                SysUserDuty item = new SysUserDuty();
+                item.setUserId(sysUser.getUserId());
+                item.setDuty(duty);
+
+                SysUserDuty exists = sysUserDutyMapper.getByUserAndDuty(sysUser.getUserId(), duty);
+                if (null != exists) {
+                    item.setId(exists.getId());
+                } else {
+                    sysUserDutyMapper.insert(item);
+                }
+
+                idList.add(item.getId());
+            }
+
+            // 去除垃圾数据
+            sysUserDutyMapper.deleteNotIn(sysUser.getUserId(), idList);
+        }
+
         return true;
     }
 

src/main/java/com/example/civilizedcity/service/impl/TaIssueServiceImpl.java

@@ -1,12 +1,21 @@
 package com.example.civilizedcity.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.mapper.TaOrgIssueMapper;
+import com.example.civilizedcity.vo.StatVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaIssue;
 import com.example.civilizedcity.mapper.TaIssueMapper;
 import com.example.civilizedcity.service.TaIssueService;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 问题表;(ta_issue)表服务实现类
  *
@@ -16,6 +25,9 @@ import com.example.civilizedcity.service.TaIssueService;
 @Service
 public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue> implements TaIssueService {
 
+    @Autowired
+    TaOrgIssueMapper taOrgIssueMapper;
+
     @Override
     public IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String orgId) {
         if (null == orgId) {
@@ -35,4 +47,53 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
     public void updateApply(Integer issueId, String applyType, Integer applyId) {
         baseMapper.updateApply(issueId, applyType, applyId);
     }
+
+    @Override
+    public List<StatVo> statMaIndex(SysUser user, String duty) {
+        List<StatVo> result = new ArrayList<>();
+
+        // 督察员
+        if (Constants.DUTY_INSPECTOR.equals(duty)) {
+            Map<String, Object> res = baseMapper.statMaIndex(user.getUserId());
+            result.add(new StatVo().setName("已上报").setValue(getStatValueBy(res.get("published_num"), 0)));
+            result.add(new StatVo().setName("已交办").setValue(getStatValueBy(res.get("assigned_num"), 0)));
+            result.add(new StatVo().setName("未交办").setValue(getStatValueBy(res.get("unassigned_num"), 0)));
+        }
+
+        // 管理员
+        else if (Constants.DUTY_MANAGER.equals(duty)) {
+            Map<String, Object> res = baseMapper.statMaIndex(null);
+            result.add(new StatVo().setName("未处理").setValue(getStatValueBy(res.get("unassigned_num"), 0)));
+            result.add(new StatVo().setName("已交办").setValue(getStatValueBy(res.get("assigned_num"), 0)));
+            result.add(new StatVo().setName("已办结").setValue(getStatValueBy(res.get("end_num"), 0)));
+        }
+
+        // 单位人员 或者 单位管理员
+        else if (Constants.DUTY_ORG_USER.equals(duty) || Constants.DUTY_ORG_MANAGER.equals(duty)) {
+            Map<String, Object> res = taOrgIssueMapper.statMaIndex(user.getOrgId());
+            result.add(new StatVo().setName("处理中").setValue(getStatValueBy(res.get("doing_num"), 0)));
+            result.add(new StatVo().setName("已办结").setValue(getStatValueBy(res.get("end_num"), 0)));
+            result.add(new StatVo().setName("已逾期").setValue(getStatValueBy(res.get("delay_num"), 0)));
+        }
+
+        // 查询人员
+        else if (Constants.DUTY_QUERY_PERSON.equals(duty)) {
+            Map<String, Object> res = baseMapper.statMaIndex(null);
+            result.add(new StatVo().setName("未处理").setValue(getStatValueBy(res.get("unassigned_num"), 0)));
+            result.add(new StatVo().setName("处理中").setValue(getStatValueBy(res.get("assigned_num"), 0)));
+            result.add(new StatVo().setName("已办结").setValue(getStatValueBy(res.get("end_num"), 0)));
+        }
+
+        // 市民
+        else {
+
+        }
+
+        return result;
+    }
+
+    Integer getStatValueBy(Object v, Integer def) {
+        if (null == v) return def;
+        return Integer.valueOf(v.toString());
+    }
 }

src/main/java/com/example/civilizedcity/vo/StatVo.java

@@ -0,0 +1,17 @@
+package com.example.civilizedcity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ApiModel("统计参数")
+public class StatVo {
+    @ApiModelProperty("统计指标")
+    String name;
+
+    @ApiModelProperty("统计结果")
+    Object value;
+}

src/main/resources/mapper/SysUserDutyMapper.xml

@@ -2,6 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.SysUserDutyMapper">
+    <delete id="deleteNotIn">
+        DELETE t
+        FROM
+            sys_user_duty t
+        WHERE
+            t.user_id = #{userId}
+        AND t.id NOT IN
+        <foreach item="item" collection="idList" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+    </delete>
 
     <select id="getListByUser" resultType="java.lang.String">
         SELECT
@@ -11,4 +22,13 @@
         WHERE
             t.user_id = #{userId}
     </select>
+    <select id="getByUserAndDuty" resultType="com.example.civilizedcity.entity.SysUserDuty">
+        SELECT
+            t.*
+        FROM
+            sys_user_duty t
+        WHERE
+            t.user_id = #{userId}
+            AND t.duty = #{duty}
+    </select>
 </mapper>

src/main/resources/mapper/TaIssueMapper.xml

@@ -45,4 +45,20 @@
         ORDER BY
             t.create_date DESC
     </select>
+    <select id="statMaIndex" resultType="java.util.Map">
+        SELECT
+            UUID_SHORT() as id,
+            count(*) as published_num,
+            sum(IF(t.process_node = 'start', 1, 0)) as unassigned_num,
+            sum(IF(t.process_node = 'assigned', 1, 0)) as assigned_num,
+            sum(IF(t.process_node = 'reject', 1, 0)) as reject_num,
+            sum(IF(t.process_node = 'end', 1, 0)) as end_num
+        FROM
+            ta_issue t
+        WHERE 1 = 1
+          <if test="null != userId and userId != ''">
+              AND t.create_user = #{userId}
+          </if>
+          AND t.`status` > - 1
+    </select>
 </mapper>

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -46,4 +46,16 @@
           AND t.org_id = #{orgId}
           AND t.`status` = 1
     </select>
+    <select id="statMaIndex" resultType="java.util.Map">
+        select
+            UUID_SHORT() as id,
+            SUM(IF(TO_DAYS(now()) > TO_DAYS(s.expire_date), 1, 0)) as delay_num,
+            SUM(s.process_node == 'end', 1, 0) as end_num,
+            SUM(s.process_node != 'end', 1, 0) as doing_num
+        from ta_org_issue t
+                 INNER JOIN ta_issue s on t.issue_id = s.issue_id
+        where t.org_id = #{orgId}
+          and t.`status` &gt; -1
+          and s.`status` &gt; -1
+    </select>
 </mapper>