登录和部门的修改通话记录等

zwrx-api/pom.xml

@@ -70,6 +70,11 @@
             <artifactId>druid</artifactId>
             <version>1.1.22</version>
         </dependency>
+        <dependency>
+            <groupId>com.getui.push</groupId>
+            <artifactId>restful-sdk</artifactId>
+            <version>1.0.3.0</version>
+        </dependency>
 
         <!--        <dependency>-->
 <!--            <groupId>org.apache.shardingsphere</groupId>-->

zwrx-api/src/main/java/api/controller/HomeController.java

@@ -17,6 +17,7 @@ import api.util.constants.CacheConstants;
 import api.util.helper.*;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -121,8 +122,15 @@ public class HomeController extends BaseController {
         }
         String encrypt = SecretHelper.MD5(input.getPassword());
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper<>();
-        qw.eq(User::getUserName, input.getUserName())
-                .eq(User::getPassword, encrypt)
+        try{
+        int usercode= Integer.parseInt( input.getUserName());
+        qw.eq(User::getUserName,input.getUserName());
+        }catch (Exception e ){
+            qw.eq(User::getNickName,input.getUserName());
+        }
+
+
+        qw     .eq(User::getPassword, encrypt)
                 .eq(User::getDeleteFlag, 0);
         User user = userService.getEntity(qw);
 
@@ -132,12 +140,42 @@ public class HomeController extends BaseController {
             logininforService.insert(logininfor);
             return Error("账号或者密码错误");
         }
-        if (!Objects.equals(user.getDeleteFlag(), "1")) {
-            logininfor.setMsg("账号已禁用");
+        if (Objects.equals(user.getDeleteFlag(), "1")) {
+            logininfor.setMsg("账号已禁用"+input.getUserName()+"分机号-" + input.getExtensionPhone());//
             logininfor.setStatus("1");
             logininforService.insert(logininfor);
             return Error("账号已禁用");
+        }else if(Objects.equals(user.getDeleteFlag(), "2")){
+            LambdaQueryWrapper<Logininfor>  loginqw=new LambdaQueryWrapper<>();
+            loginqw.eq(Logininfor::getUserName,input.getUserName()).like(Logininfor::getMsg,"锁定账号登录").orderByDesc(Logininfor::getInfoId);
+
+           List<Logininfor> inforList= logininforService.getList(loginqw);
+
+           if(inforList!=null &&inforList.stream().count()>0) {
+               if (DateHelper.calcutemin(new Date(), inforList.stream().findFirst().get().getLoginTime()) > 30) {
+                   LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
+                   updateWrapper.eq(User::getUserId, user.getUserId()).set(User::getDeleteFlag, 0);
+                   userService.updateBatch(updateWrapper);
+
+               } else {
+                   logininfor.setMsg("锁定账号登录：帐号-" + input.getUserName() + ";分机号-" + input.getExtensionPhone());
+                   logininfor.setStatus("1");
+                   logininforService.insert(logininfor);
+                   return Error("此账号已经被锁定,请联系管理员解锁");
+
+               }
+           }else {
+
+                   logininfor.setMsg("锁定账号登录：帐号-" + input.getUserName() + ";分机号-" + input.getExtensionPhone());
+                   logininfor.setStatus("1");
+                   logininforService.insert(logininfor);
+                   return Error("此账号已经被锁定,请联系管理员解锁");
+           }
+
+
+
         }
+
         user.setLastLoginDate(new Date());
         user.setLoginIp(ServletHelper.getIpAddr(request));
         userService.update(user);
@@ -154,6 +192,7 @@ public class HomeController extends BaseController {
         cls.put("RoleCode", role.getRoleCode());
         String token = JwtHelper.createToken(cls);
 
+        
 //        Calendar oldCal = Calendar.getInstance();
 //        if (user.getUpdatePasswordTime() == null) {
 //            oldCal.setTime(user.getCreateTime());
@@ -173,7 +212,7 @@ public class HomeController extends BaseController {
 //        data.put("easyPassword", easyPassword);
 
         logininfor.setStatus("0");
-        logininfor.setMsg("登陆成功");
+        logininfor.setMsg("登录成功");
         logininforService.insert(logininfor);
 
         return Success("登录成功", data);

zwrx-api/src/main/java/api/controller/system/DeptController.java

@@ -73,6 +73,21 @@ public class DeptController extends BaseController {
             return Success("成功", deptService.getList(qw));
         }
     }
+    @ApiOperation("新 二级单位交办时，获取子部门列表")
+    @Log(title = "二级单位交办时，获取子部门列表", businessType = BusinessType.QUERY)
+    @GetMapping
+    public AjaxResult getSonList() {
+        LambdaQueryWrapper<Dept> qw = new LambdaQueryWrapper();
+        qw.eq(Dept::getState,0L)
+                        .eq(Dept::getIsDept,2L).eq(Dept::getParentId,CurrentUser().getDeptId());
+            return Success("成功", deptService.getList(qw));
+
+    }
+    @ApiOperation("新 话务员交办时，获取要交办的部门tree")
+    @GetMapping("/deptZBTree")
+    public AjaxResult deptZBTree() {
+        return Success("查询成功", deptService.selectZBDeptTreeList());
+    }
 
     /**
      * 查询部门列表（排除节点）

zwrx-api/src/main/java/api/controller/system/UserController.java

@@ -123,6 +123,8 @@ public class UserController extends BaseController {
         if (StringHelper.isEmpty(user.getNickName()))
             return Error("请输入工号");
 
+        user.setMobileShow(user.getMobile().substring(0,3)+"****"+user.getMobile().substring(7));
+        user.setMobile(SecretHelper.AesEncrypt( user.getMobile()));
         user.setPassword(SecretHelper.MD5(user.getPassword()));
         user.setCreateBy(CurrentUser().getUserName());
         boolean result = userService.insert(user);
@@ -285,8 +287,7 @@ public class UserController extends BaseController {
 
     public AjaxResult deptTree(Dept dept) {
         return Success("查询成功", deptService.selectDeptTreeList(dept));
-    }
-
+}
 
 
     @GetMapping("/deptUserTree")

zwrx-api/src/main/java/api/filter/AuthenticationInterceptor.java

@@ -44,6 +44,8 @@ public class AuthenticationInterceptor implements HandlerInterceptor {
     @Autowired
     private  IRoleService roleService;
 
+    @Autowired
+    private  IDeptService deptService;
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
 
@@ -136,6 +138,7 @@ public class AuthenticationInterceptor implements HandlerInterceptor {
                                 uv.setIndexType(role.getIndexType());
                                 uv.setRoleName(   role.getRoleName());
                                 uv.setRoleCode(role.getRoleCode());
+                                uv.setDept(deptService.getEntity(uv.getDeptId()));
                                 request.setAttribute("CurrentUser", uv);
                             }
                         }

zwrx-entity/src/main/java/api/entity/database/system/User.java

@@ -54,11 +54,15 @@ public class User {
     @ApiModelProperty("备注说明")
     private String remark;
     /** 电话 */
-    @ApiModelProperty("电话")
+    @ApiModelProperty("固定电话")
     private String telephone;
     /** 手机 */
-    @ApiModelProperty("手机")
+    @ApiModelProperty("手机号码")
     private String mobile;
+
+    @ApiModelProperty("手机号码显示中间是***号")
+    private String mobileShow;
+
     /** 家庭电话 */
     @ApiModelProperty("家庭电话")
     private String homePhone;
@@ -75,7 +79,7 @@ public class User {
     @ApiModelProperty("注销日期")
     private Date cancelOn;
     /** 删除标志 */
-    @ApiModelProperty("删除标志 0 正常 1 禁用 2 删除")
+    @ApiModelProperty("删除标志 0 正常 1 禁用 2 锁定")
     private Long deleteFlag;
     /** APP在线标志 */
     @ApiModelProperty("APP在线标志")

zwrx-entity/src/main/java/api/entity/input/LoginInput.java

@@ -19,4 +19,9 @@ public class LoginInput {
     @ApiModelProperty("来源")
     private String source;
 
+    @ApiModelProperty("分机号")
+    private String extensionPhone;
+
+
+
 }

zwrx-service/src/main/java/api/service/system/IDeptService.java

@@ -16,7 +16,10 @@ public interface IDeptService extends IBaseService<Dept> {
      * @return 结果
      */
     public boolean checkDeptNameUnique(Dept dept);
-
+    //获取处理部门的树
+  public   List<TreeSelect> selectZBDeptTreeList( ) ;
+  List<Dept> buildZBDeptTree(List<Dept> depts,List<Dept> allDept);
+  List<TreeSelect> buildZBDeptTreeSelect(List<Dept> depts,List<Dept> allDept);
     /**
      * 根据ID查询所有子部门（正常状态）
      *

zwrx-service/src/main/java/api/service/system/impl/DeptServiceImpl.java

@@ -142,6 +142,35 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, Dept> implement
     }
 
 
+    @Override
+    public List<TreeSelect> selectZBDeptTreeList(  ) {
+
+
+
+
+
+        redisHelper.deleteCache("deptZBTree");
+        if (StringHelper.isEmpty(redisHelper.getCache("deptZBTree"))){
+            LambdaQueryWrapper<Dept> qw = new LambdaQueryWrapper<>();
+            qw.eq(Dept::getDelFlag, "0")
+                    .eq(Dept::getState,0).eq(Dept::getParentId,155L).eq(Dept::getIsDept,1L);
+
+
+            LambdaQueryWrapper<Dept> allqw = new LambdaQueryWrapper<>();
+            qw.eq(Dept::getDelFlag, "0")
+                    .eq(Dept::getState,0).like(Dept::getAncestors,155L);
+
+
+
+            List<Dept> depts = this.getList(qw);
+            List<TreeSelect> treeSelects = buildZBDeptTreeSelect(depts,this.getList(allqw));
+            redisHelper.setCache("deptZBTree", JSON.toJSONString(treeSelects));
+        }
+        String cache = redisHelper.getCache("deptZBTree");
+        List<TreeSelect> treeSelects = JSON.parseArray(cache, TreeSelect.class);
+        return treeSelects;
+    }
+
 
 
     /**
@@ -338,4 +367,57 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, Dept> implement
         return getChildList(list, t).size() > 0;
     }
 
+
+
+    @Override
+    public List<TreeSelect> buildZBDeptTreeSelect(List<Dept> depts,List<Dept> allDept) {
+        System.out.print("第一步"+depts);
+        List<Dept> deptTrees = buildZBDeptTree(depts,allDept);
+
+        System.out.print("最后"+deptTrees);
+        return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
+    }
+    @Override
+    public List<Dept> buildZBDeptTree(List<Dept> depts,List<Dept> allDept) {
+        List<Dept> returnList = new ArrayList<Dept>();
+        List<Long> tempList = allDept.stream().map(Dept::getDeptId).collect(Collectors.toList());
+        System.out.print("第二步"+tempList);
+        for (Dept dept : depts) {
+            // 如果是顶级节点, 遍历该父节点的所有子节点
+
+                recursionZBFn(allDept, dept);
+                returnList.add(dept);
+
+        }
+        if (returnList.isEmpty()) {
+            returnList = depts;
+        }
+        return returnList;
+    }
+
+    private void recursionZBFn(List<Dept> list, Dept t) {
+        // 得到子节点列表
+        List<Dept> childList = getZBChildList(list, t);
+        t.setChildren(childList);
+        for (Dept tChild : childList) {
+            if (hasChild(list, tChild)) {
+                recursionZBFn(list, tChild);
+            }
+
+        }
+    }
+    /**
+     * 得到子节点列表
+     */
+    private List<Dept> getZBChildList(List<Dept> list, Dept t) {
+        List<Dept> tlist = new ArrayList<Dept>();
+        Iterator<Dept> it = list.iterator();
+        while (it.hasNext()) {
+            Dept n = (Dept) it.next();
+            if (!StringHelper.isNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
+                tlist.add(n);
+            }
+        }
+        return tlist;
+    }
 }

zwrx-util/src/main/java/api/util/helper/DateHelper.java

@@ -139,6 +139,15 @@ public class DateHelper extends DateUtils {
         return day + "天" + hour + "小时" + min + "分钟";
     }
 
+    public  static Long calcutemin(Date endDate,Date nowDate){
+        long nm = 1000 * 60;
+        // long ns = 1000;
+        // 获得两个时间的毫秒时间差异
+        Long diff = endDate.getTime() - nowDate.getTime();
+       Long re=  diff % nm;
+       return  re;
+    }
+
     /**
      * 增加 LocalDateTime ==> Date
      */

zwrx-util/src/main/java/api/util/helper/SecretHelper.java

@@ -76,8 +76,7 @@ public class SecretHelper {
     private static String AES_KEY = "j8z&j*a$t{w#k}e@";
     private static String AES_ECB = "AES/ECB/PKCS5Padding";
     /**
-     * 使用AES加密原始字符串.
-     *
+     * 使用AES加密原始字符串.     *
      * @param input 原始输入字符串
      */
     public static String AesEncrypt(String input) {