1.地铁盘查

src/main/java/com/metro/entity/dto/JpersonEditDTO.java

@@ -22,7 +22,6 @@ public class JpersonEditDTO implements Serializable {
     private String xm;
 
     @ApiModelProperty(value = "密码")
-    @NotEmpty(message = "密码不能为空!")
     private String passwd;
 
     @ApiModelProperty(value = "手机号 可空")

src/main/java/com/metro/entity/po/Account.java

@@ -1,17 +1,11 @@
 package com.metro.entity.po;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 import lombok.experimental.Accessors;
-import lombok.experimental.Tolerate;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 
 /**
  * @ClassName: Account
@@ -86,7 +80,7 @@ public class Account {
      * 创建时间
      */
     @TableField(value = "create_time", fill = FieldFill.INSERT)
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT-8")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
     /*
     * 创建人
@@ -98,7 +92,7 @@ public class Account {
     * 修改时间
     * */
     @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT-8")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
     /*

src/main/java/com/metro/entity/po/PassreCords.java

@@ -30,11 +30,6 @@ public class PassreCords {
      */
     private String cardId;
 
-    /**
-     * 身份证类型
-     */
-    private String cardType;
-
     /**
      * 姓名
      */
@@ -165,7 +160,9 @@ public class PassreCords {
      * 警示负责民警
      * */
     private String staffName;
-
-
+    /*
+     * 通行类型
+     * */
+    private Integer passMode;
 
 }

src/main/java/com/metro/entity/ro/account/SelectAccountPageResp.java

@@ -61,7 +61,7 @@ public class SelectAccountPageResp implements Serializable {
     private String address;
 
     @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT-8")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "创建人")
@@ -71,7 +71,7 @@ public class SelectAccountPageResp implements Serializable {
     private Integer type;
 
     @ApiModelProperty(value = "修改时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT-8")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
     @ApiModelProperty(value = "修改人")

src/main/java/com/metro/entity/ro/passrecords/SelectPassreCordsPageListResp.java

@@ -49,8 +49,8 @@ public class SelectPassreCordsPageListResp implements Serializable {
     @ApiModelProperty(value = "住址")
     private String cardAddr;
 
-    @ApiModelProperty(value = "身份证类型")
-    private String cardType;
+    @ApiModelProperty(value = "通行类型")
+    private Integer passMode;
 
     @ApiModelProperty(value = "0=抓捕，1=存疑，2=通过，3=异常")
     private Integer pass;

src/main/java/com/metro/entity/search/JPersonSearch.java

@@ -35,4 +35,7 @@ public class JPersonSearch extends BaseEntity implements Serializable {
 
     @ApiModelProperty(hidden = true)
     private Integer type;
+
+    @ApiModelProperty(hidden = true)
+    private Integer adminId;
 }

src/main/java/com/metro/entity/vo/JDevicesVO.java

@@ -67,7 +67,7 @@ public class JDevicesVO{
     private Integer licensed;
 
     @ApiModelProperty("创建时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date firstBoot;
 
     @ApiModelProperty("线号Id")

src/main/java/com/metro/service/impl/JPersonsServiceImpl.java

@@ -117,6 +117,7 @@ public class JPersonsServiceImpl implements JPersonsService {
         jPersonSearch.setBranchId(jPersons.getBranchId() !=null ? jPersons.getBranchId() : null);
         Integer type = StringUtils.isEmpty(jPersons.getCompanyId()) ? 1 : (StringUtils.isEmpty(jPersons.getBranchId())? 2 :3);
         jPersonSearch.setType(type);
+        jPersonSearch.setAdminId(userId.intValue());
         if(type == 3)throw new BusinessException("您无权查看账号列表");
         Page<JPersonVO> page = new Page<>(jPersonSearch.getPageNum(),jPersonSearch.getPageSize());
         IPage<JPersonVO>  pageList =jPersonsMapper.getPageList(page,jPersonSearch);
@@ -140,7 +141,7 @@ public class JPersonsServiceImpl implements JPersonsService {
     public Integer insert(JpersonEditDTO jpersonEditDTO) {
         Date date  = new Date();
         if(StringUtils.isNotEmpty(jpersonEditDTO.getCompanyId()) && StringUtils.isNotEmpty(jpersonEditDTO.getBranchId())){
-            if(StringUtils.isEmpty(jpersonEditDTO.getPhoto()))throw new BusinessException("部门和区域都有值的情况下，图片不能为空");
+//            if(StringUtils.isEmpty(jpersonEditDTO.getPhoto()))throw new BusinessException("部门和区域都有值的情况下，图片不能为空");
         }else if(StringUtils.isEmpty(jpersonEditDTO.getCompanyId()) && StringUtils.isEmpty(jpersonEditDTO.getBranchId())){
             throw new BusinessException("创建一级账号，请联系管理员");
         }
@@ -187,6 +188,7 @@ public class JPersonsServiceImpl implements JPersonsService {
             jPersons.setIsAdmin(0);
             jPersons.setValidStartTime(date.getTime());
             jPersons.setValidEndTime(date.getTime());
+            if(StringUtils.isEmpty(jpersonEditDTO.getPasswd()))throw new BusinessException("密码不能为空");
             integer = jPersonsMapper.insert(jPersons);
         }else {
             jPersons.setUpdateTimestamp(date.getTime());

src/main/java/com/metro/service/impl/PassreCordsServiceImpl.java

@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -110,22 +111,23 @@ public class PassreCordsServiceImpl extends BaseService implements PassreCordsSe
         Page<WarningVO> page = new Page<>(warningSearch.getPageNum(),warningSearch.getPageSize());
         IPage<WarningVO>  pageList =passreCordsMapper.warningPageList(page,warningSearch);
         List<WarningVO> records = pageList.getRecords();
-        /*获取数据中companyMap 和barnchMap*/
-        Map<String, Company> companyMap = companyService.getCompanyMapByList(records,WarningVO::getCompanyId);
-        Map<String, Company> barnchMap = companyService.getBranchMapByList(records,WarningVO::getBranchId);
+
         /*获取id列表 并根据idList获取数据列表*/
         List<Integer> idList = records.stream().map(WarningVO::getId).collect(Collectors.toList());
         LambdaQueryWrapper<PassreCords> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.in(PassreCords::getId, idList);
+        lambdaQueryWrapper.orderByDesc(PassreCords::getId);
         List<PassreCords> passreCords = passreCordsMapper.selectList(lambdaQueryWrapper);
         Map<Integer, PassreCords> map = passreCords.stream().collect(Collectors.toMap(PassreCords::getId, Function.identity()));
-
+//        /*获取数据中companyMap 和barnchMap*/
+//        Map<String, Company> companyMap = companyService.getCompanyMapByList(passreCords,PassreCords::getCompanyId);
+//        Map<String, Company> barnchMap = companyService.getBranchMapByList(passreCords,PassreCords::getBranchId);
         /*数据填入*/
         for (WarningVO record : records) {
             BeanUtils.copyProperties(map.get(record.getId()),record);
-            record.setCompanyName(companyMap.get(record.getCompanyId()) == null?"" : companyMap.get(record.getCompanyId()).getCompanyName());
-            record.setBranchName(barnchMap.get(record.getCompanyId()+record.getBranchId()) == null ?
-                    "" : barnchMap.get(record.getCompanyId()+record.getBranchId()).getBranchName()).getBranchName();
+//            record.setCompanyName(companyMap.get(record.getCompanyId()) == null?"" : companyMap.get(record.getCompanyId()).getCompanyName());
+//            record.setBranchName(barnchMap.get(record.getCompanyId()+record.getBranchId()) == null ?
+//                    "" : barnchMap.get(record.getCompanyId()+record.getBranchId()).getBranchName()).getBranchName();
         }
 
         return pageList;
@@ -209,6 +211,10 @@ public class PassreCordsServiceImpl extends BaseService implements PassreCordsSe
 //        }
         if(type == 2){
             wrapper.select(PassreCords.class,p ->!p.getColumn().equals("scene_photo"));
+            List<Integer> list = new ArrayList<>();
+            list.add(0);
+            list.add(1);
+            wrapper.in(PassreCords::getPass, list);
         }
 
         JPersonVO userInfo = jPersonsService.getUserInfo();

src/main/resources/application.yml

@@ -39,11 +39,13 @@ spring:
     is-log: false
 
   profiles:
-    active: local
+    active: prod
   servlet:
     multipart:
       max-file-size: 10MB
       max-request-size: 10MB
+  jackson:
+    time-zone: Asia/Shanghai
 
 mybatis-plus:
   mapper-locations: classpath*:/mapper/*Mapper.xml

src/main/resources/mapper/JPersonsMapper.xml

@@ -36,6 +36,7 @@
         <include refid="Base_Column_List"></include>
         from j_persons
         <where>
+            id !=  #{jPersonSearch.adminId}
             <if test="jPersonSearch.type == 1 ">
                 and (company_id is not null or company_id != '')
             </if>

src/main/resources/mapper/PassreCordsMapper.xml

@@ -8,7 +8,7 @@
         max(id) as id
         from j_passrecords
         <where>
-            pass in(0,1,3)
+            pass in(0,1)
             <if test="warningSearch.companyId !=null">
                 and company_id =# {warningSearch.companyId}
             </if>
@@ -31,7 +31,7 @@
                 AND  <![CDATA[ pass_time <= #{endTime}]]>
             </if>
         </where>
-        GROUP BY card_id,xm,phone,company_id,branch_id
+        GROUP BY card_id,company_id,branch_id
         order by id desc
     </select>
     <select id="selectBeforDataNumber" resultType="com.metro.entity.vo.PassreCordsLessVO">