null exception

sp-core/src/main/java/com/pj/project/sp_admin/SpAdminMapper.xml

@@ -6,8 +6,8 @@
 	<!-- 增 -->
 	<insert id="add">
 		insert into
-		sp_admin(name,department_id, avatar,nickname,dept_id, dept_name,super_admin, phone, role_id, create_by_aid, create_time)
-		values (#{name},#{departmentId}, #{avatar},#{nickname},#{deptId}, #{deptName},#{superAdmin}, #{phone}, #{roleId}, #{createByAid}, now())
+		sp_admin(name,department_id, avatar,nickname,dept_id, super_admin, phone, role_id, create_by_aid, create_time)
+		values (#{name},#{departmentId}, #{avatar},#{nickname},#{deptId},#{superAdmin}, #{phone}, #{roleId}, #{createByAid}, now())
 	</insert>
 
 

sp-core/src/main/java/com/pj/project/tb_car_filing/TbCarFiling.java

@@ -137,7 +137,7 @@ public class TbCarFiling extends Model<TbCarFiling> implements Serializable {
 	@TableField(fill = FieldFill.UPDATE)
 	private String updateBy;
 
-	private int judgeState;
+	private Integer judgeState=0;
 	private Date judgeTime;
 	private String judgeBy;
 
@@ -151,6 +151,10 @@ public class TbCarFiling extends Model<TbCarFiling> implements Serializable {
 	private String driverIdCardStr;
 
 	public String getDriverIdCardStr() {
+		String driverIdCard=getDriverIdCard();
+		if (StrUtil.isEmpty(driverIdCard)||!IdcardUtil.isValidCard(driverIdCard)){
+			return driverIdCard;
+		}
 		String str = IdcardUtil.getBirthByIdCard(driverIdCard);
 		if (StrUtil.isNotEmpty(str)) {
 			return driverIdCard.replace(str, "********");

sp-core/src/main/java/com/pj/project/tb_car_filing/TbCarFilingService.java

@@ -64,20 +64,27 @@ public class TbCarFilingService extends ServiceImpl<TbCarFilingMapper, TbCarFili
     private TbVenuesService tbVenuesService;
 
 
-
     /**
      * 增
      */
     public void add(TbCarFiling t) {
         String carNo = t.getCarNo().toUpperCase();
         String idCarNo = t.getDriverIdCard();
-        if (!IdcardUtil.isValidCard(t.getDriverIdCard())) {
-            throw new BusinessException("身份证不正确");
+        Long deptId = t.getDeptId();
+        if (deptId == null) {
+            throw new BusinessException("请选择备案组织");
+        }
+        TbDept tbDept = tbDeptService.getById(deptId);
+        if (tbDept.getPassType().equals(TbDept.PassTypeEnum.BLOW.getType())){
+            if (!IdcardUtil.isValidCard(idCarNo)) {
+                throw new BusinessException("身份证不正确");
+            }
         }
+        t.setDeptName(tbDept.getName());
         //原来是否录入过
         List<TbCarFiling> carFilingList = this.findByDriverIdCar(idCarNo);
         carFilingList.forEach(tbCarFiling -> {
-            if (tbCarFiling != null&&StrUtil.equals(tbCarFiling.getCarNo(),carNo)) {
+            if (tbCarFiling != null && StrUtil.equals(tbCarFiling.getCarNo(), carNo)) {
                 throw new BusinessException("司机已备案该车辆");
             }
         });
@@ -99,6 +106,9 @@ public class TbCarFilingService extends ServiceImpl<TbCarFilingMapper, TbCarFili
      */
     private void handlerDriver(TbCarFiling tbCarFiling) {
         String idCarNo = tbCarFiling.getDriverIdCard();
+        if (StrUtil.isEmpty(idCarNo)||!IdcardUtil.isValidCard(idCarNo)){
+            return;
+        }
         //人员是否备案
         TbPersonFiling t = tbPersonFilingService.findByIdCard(idCarNo);
         Long deptId = tbCarFiling.getDeptId();
@@ -232,7 +242,7 @@ public class TbCarFilingService extends ServiceImpl<TbCarFilingMapper, TbCarFili
      * @param t
      */
     public void judge(TbCarFiling t) {
-        TbCarFiling db=this.getById(t.getId());
+        TbCarFiling db = this.getById(t.getId());
         db.setJudgeTime(new Date()).setJudgeBy(StpUserUtil.getAdminName()).setJudgeState(t.getJudgeState());
         this.updateById(db);
         //人员备案审核

sp-core/src/main/java/com/pj/project/tb_person_filing/TbPersonFilingService.java

@@ -112,7 +112,7 @@ public class TbPersonFilingService extends ServiceImpl<TbPersonFilingMapper, TbP
         }
         t.setPin(idCard);
         TbDept tbDept = tbDeptService.getById(t.getDeptId());
-        if (tbDept!=null&&TbDept.NeedJudgeEnum.AUTO_JUDGE.getType().equals(tbDept.getNeedJudge())) {
+        if (tbDept != null && TbDept.NeedJudgeEnum.AUTO_JUDGE.getType().equals(tbDept.getNeedJudge())) {
             t.setJudgeState(1).setJudgeTime(new Date()).setJudgeBy("系统自动审核");
         }
         TbVenues tbVenues = tbVenuesService.getById(t.getVenuesId());
@@ -133,6 +133,9 @@ public class TbPersonFilingService extends ServiceImpl<TbPersonFilingMapper, TbP
                 deleteTerminalWhilte(db.getPin(), true);
             }
         });
+        if (tbCarFilingList.isEmpty()) {
+            this.deleteTerminalWhilte(db.getPin(), true);
+        }
         this.removeById(id);
     }
 
@@ -206,6 +209,9 @@ public class TbPersonFilingService extends ServiceImpl<TbPersonFilingMapper, TbP
         //备案场所
         Long venuesId = filing.getVenuesId();
         TbVenues tbVenues = tbVenuesService.getById(venuesId);
+        if (tbVenues==null){
+            return;
+        }
         //下发到等级比自己低或者同等级的场所设备
         Integer level = tbVenues.getLevel();
         List<TbTerminal> tbTerminalList = tbTerminalService.findByVenuesLevel(level);
@@ -247,6 +253,9 @@ public class TbPersonFilingService extends ServiceImpl<TbPersonFilingMapper, TbP
         Long channelId = t.getChannelId();
         //通道
         TbVenues channel = tbVenuesService.getById(channelId);
+        if (channel == null) {
+            return;
+        }
         //场所
         TbVenues venues = tbVenuesService.getById(channel.getPId());
         List<TbVenues> hightVenuesList = tbVenuesService.getHightLevel(venues.getLevel());
@@ -293,12 +302,15 @@ public class TbPersonFilingService extends ServiceImpl<TbPersonFilingMapper, TbP
      */
     public void deleteTerminalWhilte(String pin, boolean setHeart) {
         TbPersonFiling filing = this.findByPin(pin);
-        if (filing==null){
+        if (filing == null) {
             return;
         }
         //备案场所
         Long venuesId = filing.getVenuesId();
         TbVenues tbVenues = tbVenuesService.getById(venuesId);
+        if (tbVenues == null) {
+            return;
+        }
         //删除级比自己低或者同等级的场所设备
         Integer level = tbVenues.getLevel();
         List<TbTerminal> tbTerminalList = tbTerminalService.findByVenuesLevel(level);
@@ -360,7 +372,7 @@ public class TbPersonFilingService extends ServiceImpl<TbPersonFilingMapper, TbP
      */
     public void judge(TbPersonFiling filing) {
         TbPersonFiling db = this.getById(filing.getId());
-        if (db.getVenuesId()==null){
+        if (db.getVenuesId() == null) {
             throw new AjaxError("请先选择备案场所");
         }
         db.setJudgeBy(StpUserUtil.getAdminName()).setJudgeTime(new Date()).setJudgeState(filing.getJudgeState());

sp-core/src/main/java/com/pj/project/tb_terminal/TbTerminalService.java

@@ -200,7 +200,7 @@ public class TbTerminalService extends ServiceImpl<TbTerminalMapper, TbTerminal>
                 .setTerminalName(tbTerminal.getName()).setCreateTime(new Date()).setCreateBy(StpUserUtil.getAdminName());
         if (CommandType.ISSUED_USER_COMMAND.getFuncId().equals(funcId)) {
             //下发人员信息
-            JSONUtil.parseObj(params).getJSONObject("users").set("photo", "base64");
+           // JSONUtil.parseObj(params).getJSONObject("users").set("photo", "base64");
         }
         tbCommandLogService.save(tbCommandLog);
     }