Merge remote-tracking branch 'origin/master'

src/main/java/com/yx/face/controller/admin/AdminController.java

@@ -1,6 +1,7 @@
 package com.yx.face.controller.admin;
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.yx.face.boot.component.security.Authority;
 import com.yx.face.boot.core.BaseController;
@@ -116,8 +117,8 @@ public class AdminController extends BaseController {
     }
     @ApiOperation(value = "获取管理员列表(id 和 username)")
     @PostMapping("getAdminlist")
-    public RestResult<List<AdminVO>> getAdminlist() {
-        return RestResponse.ok(adminService.getAdminlist());
+    public RestResult<List<AdminVO>> getAdminlist(@RequestBody JSONObject type) {
+        return RestResponse.ok(adminService.getAdminlist(type));
     }
 
     /**

src/main/java/com/yx/face/controller/admin/AdminFaceController.java

@@ -3,6 +3,7 @@ package com.yx.face.controller.admin;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.yx.face.boot.component.security.Authority;
 import com.yx.face.boot.core.BaseController;
@@ -60,8 +61,8 @@ public class AdminFaceController extends BaseController {
 
     @ApiOperation("获取设备列表 sn / name")
     @PostMapping("getFaceDeviceList")
-    public RestResult<List<FaceDeviceVO>> getFaceDeviceList() {
-        return RestResponse.ok(faceService.getFaceDeviceList());
+    public RestResult<List<FaceDeviceVO>> getFaceDeviceList(@RequestBody JSONObject adminId) {
+        return RestResponse.ok(faceService.getFaceDeviceList(adminId));
     }
 
 

src/main/java/com/yx/face/controller/admin/SystemLongTermDocumentsController.java

@@ -9,6 +9,7 @@ import com.yx.face.boot.restful.RestResult;
 import com.yx.face.boot.uitls.ExcelListenerUtils;
 import com.yx.face.model.dto.UserWhitelistDTO;
 import com.yx.face.model.excel.UserWhitelistExcel;
+import com.yx.face.model.query.FaceDeviceQu;
 import com.yx.face.model.query.SysLongTermDocumentsQu;
 import com.yx.face.model.search.UserWhitelistSearch;
 import com.yx.face.model.vo.SystemLongTermDocumentsVO;
@@ -49,9 +50,9 @@ public class SystemLongTermDocumentsController extends BaseController {
     }
 
     @ApiOperation("添加设备")
-    @GetMapping("/add")
-    public RestResult<Boolean> add(String sn) {
-        Integer insert = systemLongTermDocumentsService.add(sn);
+    @PostMapping("/add")
+    public RestResult<Boolean> add(@RequestBody FaceDeviceQu qu) {
+        Integer insert = systemLongTermDocumentsService.add(qu);
         if (insert == 1) return RestResponse.ok(true);
         else return RestResponse.error("添加失败");
     }

src/main/java/com/yx/face/dao/AdminDao.java

@@ -30,5 +30,6 @@ public interface AdminDao extends TKMapper<Admin> {
 
     List<AdminVO> getAdminlist(AdminVO info);
 
+    List<AdminVO> getAdminLsit(@Param("type") Integer type);
 }
 

src/main/java/com/yx/face/dao/FaceDeviceDao.java

@@ -47,6 +47,6 @@ public interface FaceDeviceDao extends TKMapper<FaceDevice> {
      */
     List<FaceDevice> selectSnList(@Param("type") Integer type, @Param("sn") String sn, @Param("provinceId") Integer provinceId, @Param("adminId") Integer adminId);
 
-    Integer update(@Param("sn") String sn, @Param("type") int type);
+    Integer update(@Param("sn") String sn, @Param("type") int type, @Param("adminId") Integer adminId);
 }
 

src/main/java/com/yx/face/dao/SystemLongTermDocumentsDao.java

@@ -10,6 +10,6 @@ import java.util.List;
 
 public interface SystemLongTermDocumentsDao extends TKMapper<SystemLongTermDocuments> {
 
-    List<SystemLongTermDocumentsVO> getList(@Param("adminId") Integer adminId);
+    List<SystemLongTermDocumentsVO> getList(@Param("adminId") Integer adminId, @Param("name") String name);
 }
 

src/main/java/com/yx/face/model/query/FaceDeviceQu.java

@@ -0,0 +1,27 @@
+package com.yx.face.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@ApiModel("添加 model")
+@Data
+public class FaceDeviceQu {
+
+
+    @ApiModelProperty(value = "adminId")
+    private Integer adminId;
+
+
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "sns")
+    private List<String> sns;
+
+}
+

src/main/java/com/yx/face/model/query/SysLongTermDocumentsQu.java

@@ -14,5 +14,8 @@ public class SysLongTermDocumentsQu {
     @ApiModelProperty(value = "账号id")
     private Integer adminId;
 
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
 }
 

src/main/java/com/yx/face/model/search/FaceDeviceSearch.java

@@ -43,4 +43,7 @@ public class FaceDeviceSearch {
 
     @ApiModelProperty(value = " 2 员工通道")
     private Integer type;
+
+
+    private Integer adminIdOfStaffEntrance;
 }

src/main/java/com/yx/face/model/vo/FaceDeviceVO.java

@@ -73,5 +73,8 @@ public class FaceDeviceVO {
     @ApiModelProperty(value = "账户名称")
     private String username;
 
+    @ApiModelProperty(value = "通道账户名称")
+    private String adminIdOfStaffEntrance;
+
 }
 

src/main/java/com/yx/face/model/vo/SystemLongTermDocumentsVO.java

@@ -20,7 +20,7 @@ public class SystemLongTermDocumentsVO {
     @ApiModelProperty(value = "姓名")
     private String name;
     @ApiModelProperty(value = "头像")
-    private String image;
+    private String photo;
     @ApiModelProperty(value = "身份证号")
     private String idNumber;
     @ApiModelProperty(value = "开始时间")
@@ -31,7 +31,7 @@ public class SystemLongTermDocumentsVO {
     private Date expireTime;
     @ApiModelProperty(value = "电话")
     private String phone;
-
+    @ApiModelProperty(value = "账号名称")
     private String username;
 }
 

src/main/java/com/yx/face/service/AdminService.java

@@ -1,5 +1,6 @@
 package com.yx.face.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.yx.face.boot.restful.RestDTO;
 import com.yx.face.boot.restful.RestResult;
@@ -95,7 +96,7 @@ public interface AdminService {
     RestResult<List<String>> uploadAdminInfoExcel(List<Object> datas);
 
 
-    List<AdminVO> getAdminlist();
+    List<AdminVO> getAdminlist(JSONObject type);
 
     Boolean updateAdmin(AdminUpdate adminUpdate);
 }

src/main/java/com/yx/face/service/FaceService.java

@@ -1,5 +1,6 @@
 package com.yx.face.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.yx.face.boot.restful.RestDTO;
 import com.yx.face.model.dto.FaceDeviceDTO;
@@ -43,7 +44,7 @@ public interface FaceService {
 
     List<FaceLogVoExcel> getFaceLogsExcel(FaceServerLogSearch dto);
 
-    List<FaceDeviceVO> getFaceDeviceList();
+    List<FaceDeviceVO> getFaceDeviceList(JSONObject adminId);
 
     /**
      * 设备图片上传

src/main/java/com/yx/face/service/SystemLongTermDocumentsService.java

@@ -3,6 +3,7 @@ package com.yx.face.service;
 
 import com.github.pagehelper.PageInfo;
 import com.yx.face.boot.restful.RestDTO;
+import com.yx.face.model.query.FaceDeviceQu;
 import com.yx.face.model.query.SysLongTermDocumentsQu;
 import com.yx.face.model.vo.SystemLongTermDocumentsVO;
 
@@ -13,7 +14,7 @@ public interface SystemLongTermDocumentsService {
 
     PageInfo<SystemLongTermDocumentsVO> getList(RestDTO<SysLongTermDocumentsQu> dto);
 
-    Integer add(String sn);
+    Integer add(FaceDeviceQu qu);
 
     Integer delete(String sn);
 

src/main/java/com/yx/face/service/impl/AdminServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yx.face.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yx.face.boot.component.security.JWTUtils;
@@ -18,7 +19,6 @@ import com.yx.face.model.excel.AdminInfoExcel;
 import com.yx.face.model.search.AdminSearch;
 import com.yx.face.model.update.AdminUpdate;
 import com.yx.face.model.vo.AdminVO;
-import com.yx.face.model.vo.SystemConfigVO;
 import com.yx.face.service.AdminService;
 import com.yx.face.service.AreaCodeService;
 import com.yx.face.service.PoliceStationService;
@@ -411,9 +411,13 @@ public class AdminServiceImpl implements AdminService {
     }
 
     @Override
-    public List<AdminVO> getAdminlist() {
-        AdminVO info = getInfo();
-        return adminDao.getAdminlist(info);
+    public List<AdminVO> getAdminlist(JSONObject type) {
+        if (type != null && !type.isEmpty()) {
+            return adminDao.getAdminLsit(type.getInteger("type"));
+        } else {
+            AdminVO info = getInfo();
+            return adminDao.getAdminlist(info);
+        }
     }
 
     @Override

src/main/java/com/yx/face/service/impl/FaceServiceImpl.java

@@ -149,6 +149,7 @@ public class FaceServiceImpl implements FaceService {
         faceDevice.setPass(deviceDTO.getPass());
         faceDevice.setRemark(deviceDTO.getRemark());
         faceDevice.setUpdateTime(new Date());
+        faceDevice.setAdminId(deviceDTO.getAdminId());
         return faceDeviceDao.updateByPrimaryKeySelective(faceDevice) == 1;
     }
 
@@ -418,11 +419,17 @@ public class FaceServiceImpl implements FaceService {
     }
 
     @Override
-    public List<FaceDeviceVO> getFaceDeviceList() {
-        AdminVO info = adminService.getInfo();
+    public List<FaceDeviceVO> getFaceDeviceList(JSONObject adminId) {
+        AdminVO info;
         Map<String, Object> map = new HashMap<>();
+        if (adminId != null && !adminId.isEmpty()){
+            info = adminService.getInfo(adminId.getInteger("adminId"));
+        }else {
+            info = adminService.getInfo();
+        }
         map.put("adminVo", info);
         return faceDeviceDao.getFaceDeviceList(map);
+
     }
 
     /**

src/main/java/com/yx/face/service/impl/SystemLongTermDocumentsServiceImpl.java

@@ -7,9 +7,9 @@ import com.yx.face.boot.restful.RestDTO;
 import com.yx.face.boot.restful.ServiceException;
 import com.yx.face.dao.FaceDeviceDao;
 import com.yx.face.dao.SystemLongTermDocumentsDao;
+import com.yx.face.model.query.FaceDeviceQu;
 import com.yx.face.model.query.SysLongTermDocumentsQu;
 import com.yx.face.model.vo.SystemLongTermDocumentsVO;
-import com.yx.face.model.vo.UserWhitelistVO;
 import com.yx.face.service.SystemLongTermDocumentsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -32,23 +32,25 @@ public class SystemLongTermDocumentsServiceImpl implements SystemLongTermDocumen
         if (dto.getData() == null) {
             throw new ServiceException("参数有误");
         }
-        if (dto.getData().getAdminId() == null) {
-            throw new ServiceException("参数有误");
-        }
+//        if (dto.getData().getAdminId() == null) {
+//            throw new ServiceException("参数有误");
+//        }
         PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
-        List<SystemLongTermDocumentsVO> list = systemLongTermDocumentsDao.getList(dto.getData().getAdminId());
+        List<SystemLongTermDocumentsVO> list = systemLongTermDocumentsDao.getList(dto.getData().getAdminId(), dto.getData().getName());
         return new PageInfo<>(list);
     }
 
     @Override
-    public Integer add(String sn) {
-        Integer add = faceDeviceDao.update(sn, 2);
-        return add;
+    public Integer add(FaceDeviceQu qu) {
+        for (String sn : qu.getSns()) {
+            faceDeviceDao.update(sn, 2, qu.getAdminId());
+        }
+        return 1;
     }
 
     @Override
     public Integer delete(String sn) {
-        Integer update = faceDeviceDao.update(sn, 1);
+        Integer update = faceDeviceDao.update(sn, 1, 0);
         return update;
     }
 }

src/main/resources/mapper/AdminDao.xml

@@ -115,6 +115,13 @@
             </if>
         </where>
     </select>
+    <select id="getAdminLsit" resultType="com.yx.face.model.vo.AdminVO">
+        select
+            a.id AS adminId,
+            a.username AS username
+        FROM admin a
+        where a.type = #{type}
+    </select>
 
 </mapper>
 

src/main/resources/mapper/FaceDeviceDao.xml

@@ -3,7 +3,8 @@
 <mapper namespace="com.yx.face.dao.FaceDeviceDao">
     <update id="update">
         UPDATE face_device
-        SET type = #{type}
+        SET type = #{type},
+        admin_id_of_staff_entrance = #{adminId}
         WHERE sn = #{sn}
     </update>
 
@@ -33,9 +34,11 @@
         a.city_name as cityName,
         a.area_name as areaName,
         a.id as adminId,
-        a.username as username
+        a.username as username,
+        b.username as adminIdOfStaffEntrance
         FROM face_device fd
         left join admin a on a.id = fd.admin_id
+        left join admin b on b.id = fd.admin_id_of_staff_entrance
         <where>
             <if test="adminVo.type == 1">
 
@@ -89,6 +92,9 @@
             <if test="fde.enable != null">
                 and fd.enable =#{fde.enable}
             </if>
+            <if test="fde.adminIdOfStaffEntrance != null">
+                and fd.admin_id_of_staff_entrance =#{fde.adminIdOfStaffEntrance}
+            </if>
         </where>
         ORDER BY fd.id DESC
     </select>

src/main/resources/mapper/SystemLongTermDocumentsDao.xml

@@ -4,15 +4,24 @@
 
     <select id="getList" resultType="com.yx.face.model.vo.SystemLongTermDocumentsVO">
         SELECT a.id,
-               a.name,
-               a.image,
-               a.id_number   AS idNumber,
-               a.create_time AS createTime,
-               a.expire_time AS expireTime,
-               a.phone,
-               b.username
+        a.name,
+        a.photo,
+        a.id_number AS idNumber,
+        a.create_time AS createTime,
+        a.expire_time AS expireTime,
+        a.phone,
+        b.username
         FROM system_long_term_documents AS a
-                 LEFT JOIN admin AS b on a.admin_id = b.id
+        LEFT JOIN admin AS b on a.admin_id = b.id
+        <where>
+            <if test="adminId != null ">
+                and a.admin_id = #{adminId}
+            </if>
+            <if test="name != null and name != ''">
+                and a.name like concat('%',#{name},'%')
+            </if>
+        </where>
+
     </select>
 </mapper>