feats

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

@@ -8,9 +8,15 @@ import com.example.civilizedcity.service.TaPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
 @Component
 public class BaseController {
 
+    @Resource
+    HttpServletRequest request;
+
     @Autowired
     protected SysUserService sysUserService;
 
@@ -23,23 +29,25 @@ public class BaseController {
             throw new Exception("请先登录");
         }
 
-        SysUser user = sysUserService.getById(loginId);
+        String userId = loginId;
+        SysUser user = sysUserService.getById(userId);
         if (user == null || user.getStatus() == Constants.STATUS_DELETE) {
-            throw new Exception("人员不存在");
+            return null;
         }
 
         return user;
     }
 
     public TaPerson currentPerson() throws Exception {
-        String loginId = StpUtil.getLoginIdAsString();
-        if (StringUtils.isEmpty(loginId)) {
-            throw new Exception("请先登录");
+
+        String personId = request.getHeader("x-personId");
+        if (StringUtils.isEmpty(personId)) {
+            return null;
         }
 
-        TaPerson taPerson = taPersonService.getById(loginId);
+        TaPerson taPerson = taPersonService.getById(personId);
         if (taPerson == null || taPerson.getStatus() == Constants.STATUS_DELETE) {
-            throw new Exception("人员不存在");
+            return null;
         }
 
         return taPerson;

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

@@ -82,11 +82,19 @@ public class SysOrgController extends BaseController {
             return ResponseBean.error("名称不能为空");
         }
 
+        if (StringUtils.isEmpty(sysOrg.getOrgPId())) {
+            return ResponseBean.error("父级节点不能为空");
+        }
+
         long i = sysOrgService.countBy("name", sysOrg.getName(), false);
         if (i > 0) {
             return ResponseBean.error("名称已存在");
         }
 
+        // 构造 org 编码
+        long maxCode = sysOrgService.getMaxCodeOfParent(sysOrg.getOrgPId());
+        sysOrg.setOrgCode(String.valueOf(maxCode + 1));
+
         sysOrg.setOrgId(null);
         sysOrg.setStatus(Constants.STATUS_NORMAL);
         sysOrg.setCreateDate(LocalDateTime.now());
@@ -113,6 +121,17 @@ public class SysOrgController extends BaseController {
             return ResponseBean.error("名称已存在");
         }
 
+        // 比较是否更新了父节点
+        SysOrg origin = sysOrgService.getById(id);
+        if (!origin.getOrgPId().equals(sysOrg.getOrgPId())) {
+            // 如果更换了
+            long maxCode = sysOrgService.getMaxCodeOfParent(sysOrg.getOrgPId());
+            String newCode = String.valueOf(maxCode + 1);
+            // 当前节点以及子节点，全部更换
+            sysOrgService.changeOrgCode(origin.getOrgCode(), newCode);
+            sysOrg.setOrgCode(newCode);
+        }
+
         sysOrg.setOrgId(id);
         sysOrgService.updateById(sysOrg);
         return ResponseBean.success(sysOrg);

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

@@ -64,7 +64,7 @@ public class TaCheckItemQuController extends BaseController {
         IPage<TaCheckItemQu> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaCheckItemQu> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("item_id", itemId);
-        queryWrapper.orderByDesc("sort_no");
+        queryWrapper.orderByAsc("sort_no");
         IPage<TaCheckItemQu> result = taCheckItemQuService.page(pg, queryWrapper);
 
         List<TaCheckItemQu> quList = result.getRecords();
@@ -125,8 +125,8 @@ public class TaCheckItemQuController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taCheckItemQu/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id) {
-        taCheckItemQuService.removeLogicById(id);
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
+        taCheckItemQuService.removeById(id);
         return ResponseBean.success("success");
     }
 }

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

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
+
 import java.util.List;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +17,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TdLocType;
 import com.example.civilizedcity.service.TdLocTypeService;
 
- /**
+/**
  * 点位分类;(td_loc_type)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
@@ -23,12 +27,12 @@ import com.example.civilizedcity.service.TdLocTypeService;
 @RestController
 @RequestMapping("/")
 public class TdLocTypeController extends BaseController {
-    
+
     @Autowired
     private TdLocTypeService tdLocTypeService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param typeId 主键
      * @return 实例对象
@@ -38,28 +42,29 @@ public class TdLocTypeController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(tdLocTypeService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/tdLocType")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
+
         IPage<TdLocType> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TdLocType> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TdLocType> result = tdLocTypeService.page(pg);
-        
+        QueryWrapper<TdLocType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
+        IPage<TdLocType> result = tdLocTypeService.page(pg, queryWrapper);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param tdLocType 实例对象
@@ -72,8 +77,8 @@ public class TdLocTypeController extends BaseController {
         tdLocTypeService.save(tdLocType);
         return ResponseBean.success(tdLocType);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param tdLocType 实例对象
@@ -82,13 +87,13 @@ public class TdLocTypeController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/tdLocType/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TdLocType tdLocType,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
         tdLocType.setTypeId(id);
         tdLocTypeService.updateById(tdLocType);
         return ResponseBean.success(tdLocType);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param typeId 主键
@@ -96,7 +101,7 @@ public class TdLocTypeController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/tdLocType/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         tdLocTypeService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -12,6 +12,7 @@ import com.example.civilizedcity.config.WxMaUitl;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaPerson;
 import com.example.civilizedcity.entity.TaPersonReflect;
+import com.example.civilizedcity.service.SysUserDutyService;
 import com.example.civilizedcity.service.TaPersonReflectService;
 import com.example.civilizedcity.vo.LoginParam;
 import io.swagger.annotations.Api;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Api(tags = "小程序登入/登出")
@@ -35,6 +37,9 @@ public class WxMaController extends BaseController {
     @Autowired
     TaPersonReflectService taPersonReflectService;
 
+    @Autowired
+    SysUserDutyService sysUserDutyService;
+
 
 //    private boolean checkLoginParam(LoginParam loginParam) {
 //        return !StringUtils.isEmpty(loginParam.getCode())
@@ -84,13 +89,8 @@ public class WxMaController extends BaseController {
             taPersonService.save(taPerson);
         }
 
-//        SysUser user = taPersonService.getReflectUser(taPerson);
-
-        StpUtil.login(taPerson.getPersonId(), "miniapp");
         Map<String, Object> res = new HashMap<>();
         res.put("person", taPerson);
-//        res.put("user", user);
-        res.put("token", StpUtil.getTokenValue());
         res.put("sessionKey", sessionKey);
 
         return ResponseBean.success(res);
@@ -102,31 +102,44 @@ public class WxMaController extends BaseController {
      * @return
      * @throws Exception
      */
-    public ResponseBean signin(@ApiParam("登录参数") LoginParam param) throws Exception {
+    @PostMapping("/signin")
+    @ApiOperation(value="用户登录", notes = "用户登录", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean signin(@ApiParam("登录参数") @RequestBody LoginParam param) throws Exception {
 
         if (StringUtils.isEmpty(param.getAccount()) || StringUtils.isEmpty(param.getPassword())) {
             return ResponseBean.error("登录用户或者密码不能为空");
         }
 
         SysUser user = sysUserService.login(param);
+        List<String> dutyList = sysUserDutyService.getListByUser(user.getUserId());
+        user.setDutyList(dutyList);
 
-        TaPerson taPerson = currentPerson();
-        TaPerson reflectd = taPersonService.getByUser(user);
+        // 登录新用户
+        StpUtil.login(user.getUserId(), "miniapp");
 
-        // 如果未绑定
-        if (null == reflectd) {
-            TaPersonReflect personReflect = new TaPersonReflect();
-            taPersonReflectService.save(personReflect);
-            reflectd = taPerson;
-        }
+        Map<String, Object> res = new HashMap<>();
+        res.put("user", user);
+        res.put("token", StpUtil.getTokenValue());
+
+        return ResponseBean.success(res);
+    }
+
+    /**
+     * 获取当前用户
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/current")
+    @ApiOperation(value="获取当前用户", notes = "获取当前用户", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean current() throws Exception {
+        SysUser user = currentUser();
+        List<String> dutyList = sysUserDutyService.getListByUser(user.getUserId());
+        user.setDutyList(dutyList);
 
-        // 退出原用户
-        StpUtil.logout(taPerson.getPersonId(), "miniapp");
         // 登录新用户
-        StpUtil.login(reflectd.getPersonId(), "miniapp");
+        StpUtil.login(user.getUserId(), "miniapp");
 
         Map<String, Object> res = new HashMap<>();
-        res.put("person", reflectd);
         res.put("user", user);
         res.put("token", StpUtil.getTokenValue());
 

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

@@ -62,4 +62,8 @@ public class SysUser implements Serializable,Cloneable{
      @ApiModelProperty(name = "资源列表", notes = "")
      @TableField(exist = false)
      List<SysResource> resourcesList;
+
+     @ApiModelProperty(name = "职责列表", notes = "")
+     @TableField(exist = false)
+     List<String> dutyList;
 }

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

@@ -12,5 +12,8 @@ import com.example.civilizedcity.entity.SysOrg;
  */
 @Mapper
 public interface SysOrgMapper  extends BaseMapper<SysOrg>{
-    
-}
+
+     String sysOrgService(@Param("orgPId") String orgPId);
+
+     long changeOrgCode(@Param("from") String from, @Param("to") String to);
+ }

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

@@ -5,12 +5,15 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.SysUserDuty;
 
- /**
+import java.util.List;
+
+/**
  * 用户身份;(sys_user_duty)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 @Mapper
 public interface SysUserDutyMapper  extends BaseMapper<SysUserDuty>{
-    
-}
+
+     List<String> getListByUser(@Param("userId") String userId);
+ }

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

@@ -9,5 +9,8 @@ import com.example.civilizedcity.entity.SysOrg;
  * @date : 2022-12-12
  */
 public interface SysOrgService extends IBaseService<SysOrg> {
-    
-}
+
+     long getMaxCodeOfParent(String orgPId);
+
+     boolean changeOrgCode(String from, String to);
+ }

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

@@ -3,11 +3,14 @@ package com.example.civilizedcity.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.SysUserDuty;
 
- /**
+import java.util.List;
+
+/**
  * 用户身份;(sys_user_duty)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 public interface SysUserDutyService extends IBaseService<SysUserDuty> {
-    
-}
+
+     List<String> getListByUser(String userId);
+ }

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

@@ -1,16 +1,41 @@
 package com.example.civilizedcity.service.impl;
 
+import com.example.civilizedcity.common.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.SysOrg;
 import com.example.civilizedcity.mapper.SysOrgMapper;
 import com.example.civilizedcity.service.SysOrgService;
- /**
+
+/**
  * 单位表;(sys_org)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-12
  */
 @Service
 public class SysOrgServiceImpl extends BaseServiceImpl<SysOrgMapper, SysOrg> implements SysOrgService {
-    
+
+    final static String ROOT_ID = "-1";
+
+    @Override
+    public long getMaxCodeOfParent(String orgPId) {
+        String maxCode = baseMapper.sysOrgService(orgPId);
+        if (StringUtils.isEmpty(maxCode)) {
+            if (ROOT_ID.equals(orgPId)) {
+                return 100;
+            } else {
+                SysOrg org = getById(orgPId);
+                String childCode = org.getOrgCode() + "000";
+                return Long.parseLong(childCode);
+            }
+        }
+
+        return Long.parseLong(maxCode);
+    }
+
+    @Override
+    public boolean changeOrgCode(String from, String to) {
+        return baseMapper.changeOrgCode(from, to) > 0;
+    }
 }

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

@@ -5,12 +5,20 @@ import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.SysUserDuty;
 import com.example.civilizedcity.mapper.SysUserDutyMapper;
 import com.example.civilizedcity.service.SysUserDutyService;
- /**
+
+import java.util.List;
+
+/**
  * 用户身份;(sys_user_duty)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-12
  */
 @Service
 public class SysUserDutyServiceImpl extends BaseServiceImpl<SysUserDutyMapper, SysUserDuty> implements SysUserDutyService {
-    
+
+    @Override
+    public List<String> getListByUser(String userId) {
+        return baseMapper.getListByUser(userId);
+    }
 }

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

@@ -32,6 +32,10 @@ public class TaCheckItemAnServiceImpl extends BaseServiceImpl<TaCheckItemAnMappe
             put("qu_id", quId);
         }});
 
+        if (null == answerList || answerList.isEmpty()) {
+            return true;
+        }
+
         for (int i = 0; i < answerList.size(); i ++) {
             TaCheckItemAn item = answerList.get(i);
             item.setQuId(quId);

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

@@ -21,6 +21,7 @@ public class TaCheckItemQuServiceImpl extends BaseServiceImpl<TaCheckItemQuMappe
         QueryWrapper<TaCheckItemQu> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("item_id", itemId);
         queryWrapper.orderByDesc("sort_no");
+        queryWrapper.last("limit 1");
 
         TaCheckItemQu one = getOne(queryWrapper);
         return null == one ? 0 : one.getSortNo();

src/main/resources/application.yml

@@ -27,6 +27,7 @@ yz:
       - "/v2/**"
       - "/static/**"
       - "/**/login"
+      - "/**/signin"
 
 wx:
   miniapp:

src/main/resources/mapper/SysOrgMapper.xml

@@ -2,5 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.SysOrgMapper">
-    
+    <update id="changeOrgCode">
+        UPDATE sys_org t
+        SET t.org_code = INSERT ( t.org_code, 1, LENGTH( #{from} ), #{to} )
+        WHERE
+            t.org_code LIKE CONCAT(#{from}, '%')
+    </update>
+
+    <select id="sysOrgService" resultType="java.lang.String">
+        SELECT
+            t.org_code
+        FROM
+            sys_org t
+        WHERE
+            t.org_p_id = #{orgPId}
+          AND t.`status` &gt; - 1
+        ORDER BY
+            t.org_code DESC
+            LIMIT 1
+    </select>
 </mapper>

src/main/resources/mapper/SysUserDutyMapper.xml

@@ -2,5 +2,13 @@
 <!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">
-    
+
+    <select id="getListByUser" resultType="java.lang.String">
+        SELECT
+            t.duty
+        FROM
+            sys_user_duty t
+        WHERE
+            t.user_id = #{userId}
+    </select>
 </mapper>