sss

src/main/java/com/sysu/admin/api/user/ApiUserController.java

@@ -15,17 +15,13 @@ import com.xiesx.fastboot.base.result.R;
 import com.xiesx.fastboot.core.token.JwtHelper;
 import com.xiesx.fastboot.core.token.cfg.TokenCfg;
 import com.xiesx.fastboot.core.token.handle.CurrentToken;
-import io.jsonwebtoken.Claims;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.xmlbeans.impl.xb.ltgfmt.FileDesc;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
 import java.util.Map;
 
 @RequestMapping("/api/user")
@@ -78,7 +74,7 @@ public class ApiUserController extends BaseComponent {
         User user = userService.findByUsername(mobile);
         if(user == null) {
             user = new User().setCode(code).setUsername(mobile).setIsBlack(0).setIsDel(0).setIsEnable(0)
-                    .setRoleId((long) SRole.RoleEnum.zjxc.ordinal()).setNickname("")
+                    .setRoleId((long) SRole.RoleEnum.jl.ordinal()).setNickname("")
                     .setPassword(DigestUtils.md5Hex(mobile + code)).setOrganId(Organ.defaultOrgan);
             userService.saveAndFlush(user);
         }

src/main/java/com/sysu/admin/controller/lz/ns/site/ActionRecordVo.java

@@ -14,6 +14,7 @@ public class ActionRecordVo {
     private Integer source;
     private Integer typeId;
     private String title;
+    private Integer executor;
 
 
 }

src/main/java/com/sysu/admin/controller/lz/ns/site/NsActionRecordController.java

@@ -1,17 +1,16 @@
 package com.sysu.admin.controller.lz.ns.site;
 
+import com.querydsl.core.types.dsl.BooleanExpression;
 import com.sysu.admin.controller.lz.ns.NsActionRecordService;
 import com.sysu.admin.controller.lz.ns.NsActionTreeService;
 import com.sysu.admin.controller.lz.ns.NsTaskService;
-import com.sysu.admin.controller.lz.ns.bean.NsActionRecord;
-import com.sysu.admin.controller.lz.ns.bean.NsActionTree;
-import com.sysu.admin.controller.lz.ns.bean.NsTask;
-import com.sysu.admin.controller.lz.ns.bean.NsType;
+import com.sysu.admin.controller.lz.ns.bean.*;
 import com.sysu.admin.controller.lz.tree.LzTree;
 import com.sysu.admin.controller.lz.tree.LzTreeService;
 import com.sysu.admin.site.CommonVo;
 import com.xiesx.fastboot.base.result.BaseResult;
 import com.xiesx.fastboot.base.result.R;
+import com.xiesx.fastboot.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,7 +37,13 @@ public class NsActionRecordController {
         List<LzTree> treeList = lzTreeService.findListByAreaId(commonVo.getAreaId());
         List<Integer> ids = new ArrayList<>(treeList.size());
         treeList.stream().forEach(lzTree -> ids.add(lzTree.getId()));
-        List<NsTask> nsTaskList = nsTaskService.findAll();
+
+        //查询最近七天的任务
+        Date now = new Date();
+        QNsTask nsTask = QNsTask.nsTask;
+        BooleanExpression booleanExpression = nsTask.createDate.between(DateUtils.addDays(now, -7),now);
+        List<NsTask> nsTaskList = nsTaskService.findAll(booleanExpression);
+
         List<NsActionRecord> res = nsActionRecordService.findAllByTreeIds(ids, commonVo.getFinished());
         List<NsActionTree> nsActionTrees = actionTreeService.findAll();
         Map<Integer, NsActionTree>  integerNsActionTreeMap =  listToMap(nsActionTrees);
@@ -100,7 +105,7 @@ public class NsActionRecordController {
             }
             nsTask.setCreateDate(now);
             nsTask.setContent(actionRecordVo.getContent());
-            nsTask.setUserId(-1);
+            nsTask.setUserId(actionRecordVo.getExecutor());
             nsTask.setNsTypeId(actionRecordVo.getTypeId());
             nsTask.setStatus(0);
             nsTask.setTreeId(tree.getId());

src/main/java/com/sysu/admin/controller/lz/ns/site/NsTaskController.java

@@ -3,22 +3,47 @@ package com.sysu.admin.controller.lz.ns.site;
 import com.sysu.admin.controller.lz.ns.NsTaskService;
 import com.sysu.admin.controller.lz.ns.NsTypeService;
 import com.sysu.admin.controller.lz.ns.bean.NsTask;
+import com.sysu.admin.controller.lz.ns.site.vo.LzUserVo;
+import com.sysu.admin.site.CommonVo;
+import com.sysu.admin.support.system.user.User;
+import com.sysu.admin.support.system.user.UserService;
+import com.sysu.admin.support.system.user_role.UserRole;
+import com.sysu.admin.support.system.user_role.UserRoleService;
 import com.xiesx.fastboot.base.result.BaseResult;
 import com.xiesx.fastboot.base.result.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RequestMapping("/site/ns_task")
 @RestController
 public class NsTaskController {
 
     @Autowired
     NsTaskService nsTaskService;
+    @Autowired
+    UserRoleService userRoleService;
+    @Autowired
+    UserService userService;
 
     @RequestMapping("/list")
     public BaseResult list(){
         return R.succ(nsTaskService.findAll(Sort.by("id")));
     }
+
+    @RequestMapping("/user_list")
+    public BaseResult ydList(@RequestBody CommonVo commonVo){
+        List<UserRole> list = userRoleService.findByRoleId(commonVo.getRoleId());
+        List<Long> ids = new ArrayList<>(list.size());
+        list.stream().forEach(userRole -> ids.add(userRole.getPk().users()));
+        List<User> users = userService.findAllById(ids);
+        List<LzUserVo> lzUserVos = new ArrayList<>(users.size());
+        users.stream().forEach(user -> lzUserVos.add(new LzUserVo(user.getId().intValue(), user.getNickname())));
+        return R.succ(lzUserVos);
+    }
 }

src/main/java/com/sysu/admin/controller/lz/ns/site/vo/LzUserVo.java

@@ -0,0 +1,18 @@
+package com.sysu.admin.controller.lz.ns.site.vo;
+
+import lombok.Data;
+
+/**
+ *
+ */
+@Data
+public class LzUserVo {
+
+    public LzUserVo(Integer id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    private Integer id;
+    private String name;
+}

src/main/java/com/sysu/admin/site/CommonVo.java

@@ -21,6 +21,7 @@ public class CommonVo {
     private String wkt;
     private Integer typeId;
     private Integer finished = 0;
+    private Integer roleId;
 
     private Double x1;
     private Double y1;

src/main/java/com/sysu/admin/support/shiro/ShiroService.java

@@ -126,7 +126,7 @@ public class ShiroService {
      * @return
      */
     public boolean isXjzf(){
-        return hasRole(RoleEnum.xjzf.name());
+        return hasRole(RoleEnum.yd.name());
     }
 
     /**
@@ -134,7 +134,7 @@ public class ShiroService {
      * @return
      */
     public boolean isZjxc(){
-        return hasRole(RoleEnum.zjxc.name());
+        return hasRole(RoleEnum.jl.name());
     }
 
     /**
@@ -142,7 +142,7 @@ public class ShiroService {
      * @return
      */
     public boolean isSjzf(){
-        return hasRole(RoleEnum.sjzf.name());
+        return hasRole(RoleEnum.zj.name());
     }
 
     /**

src/main/java/com/sysu/admin/support/system/organ/OrganService.java

@@ -61,8 +61,8 @@ public class OrganService extends BaseService<Organ, Long> {
 
             UserRole userRole = new UserRole().setPk(new PKUR().users(user.getId())
                     .roles(organ.getIsBureau() == 1 ?
-                            (long)SRole.RoleEnum.xjzf.ordinal() :
-                            (long)SRole.RoleEnum.zjxc.ordinal()));
+                            (long)SRole.RoleEnum.yd.ordinal() :
+                            (long)SRole.RoleEnum.jl.ordinal()));
             mUserRoleRepository.save(userRole);
         });
     }

src/main/java/com/sysu/admin/support/system/role/SRole.java

@@ -32,7 +32,7 @@ import java.util.Date;
 public class SRole extends JpaPlusEntity<SRole> {
 
     public enum RoleEnum {
-        admin, sjzf, xjzf, zjxc;
+        admin, zj, yd, jl;
     }
 
     private static final long serialVersionUID = 1L;

src/main/java/com/sysu/admin/support/system/user_role/UserRoleRepository.java

@@ -12,4 +12,7 @@ public interface UserRoleRepository extends JpaPlusRepository<UserRole, Long> {
 
     @Query(value = "select * from sys_user_role where users=?1", nativeQuery = true)
     List<UserRole> getRoleByUsers(Long userId);
+
+    @Query(value = "from UserRole where pk.roles = ?1")
+    List<UserRole> findAllByRoleId(Long roleId);
 }

src/main/java/com/sysu/admin/support/system/user_role/UserRoleService.java

@@ -26,6 +26,10 @@ public class UserRoleService extends BaseService<UserRole, Long> {
         return mUserRoleRepository.getRoleByUsers(userId);
     }
 
+    public List<UserRole> findByRoleId(Integer roleId){
+        return mUserRoleRepository.findAllByRoleId(roleId.longValue());
+    }
+
     @Override
     public JpaPlusRepository<UserRole, Long> r() {
         return this.mUserRoleRepository;