代码规范

src/main/java/com/zhgd/xmgl/async/AsyncProjectWork.java

@@ -7,6 +7,7 @@ import com.zhgd.xmgl.modules.project.entity.ProjectEnterprise;
 import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper;
 import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
 import com.zhgd.xmgl.modules.worker.entity.*;
+import com.zhgd.xmgl.modules.worker.enums.WorkerInfoPersonTypeEnum;
 import com.zhgd.xmgl.modules.worker.mapper.*;
 import com.zhgd.xmgl.util.Base64Util;
 import com.zhgd.xmgl.util.IdCardUtils;
@@ -34,6 +35,11 @@ public class AsyncProjectWork {
     public static final String WORKER_NUMBER = "workerNumber";
     public static final String ID_CARD_END_DATE = "idCardEndDate";
     public static final String LONG_TIME = "长期";
+    public static final String TEAM_NAME = "teamName";
+    public static final String TYPE_NAME = "typeName";
+    public static final String DATA_IMAGE = "data:image";
+    public static final String SUCCESS = "SUCCESS";
+    public static final String STATUS = "status";
     @Autowired
     private WorkerInfoMapper workerInfoMapper;
     @Autowired
@@ -168,10 +174,10 @@ public class AsyncProjectWork {
             workerInfo.setIdCardUpPhotoUrl(getImageUrl(MapUtils.getString(info, "idCardUpPhotoUrl")));
             workerInfo.setIdCardBigPhotoUrl(getImageUrl(MapUtils.getString(info, "idCardBigPhotoUrl")));
             workerInfo.setIdCardDownPhotoUrl(getImageUrl(MapUtils.getString(info, "idCardDownPhotoUrl")));
-            if (personType == 2) {
+            if (personType.equals(WorkerInfoPersonTypeEnum.MANAGER.getCode())) {
                 String teamName = "";
-                if (StringUtils.isNotEmpty(MapUtils.getString(info, "teamName"))) {
+                if (StringUtils.isNotEmpty(MapUtils.getString(info, TEAM_NAME))) {
-                    teamName = MapUtils.getString(info, "teamName");
+                    teamName = MapUtils.getString(info, TEAM_NAME);
                 } else {
                     teamName = "其它";
                 }
@@ -193,8 +199,8 @@ public class AsyncProjectWork {
                 }
             } else if (personType == 1) {
                 String teamName = "";
-                if (StringUtils.isNotEmpty(MapUtils.getString(info, "teamName"))) {
+                if (StringUtils.isNotEmpty(MapUtils.getString(info, TEAM_NAME))) {
-                    teamName = MapUtils.getString(info, "teamName");
+                    teamName = MapUtils.getString(info, TEAM_NAME);
                 } else {
                     teamName = "其它";
                 }
@@ -207,8 +213,8 @@ public class AsyncProjectWork {
                     workerInfo.setTeamId(oldTeamInfo.getId());
                 } else {
                     String typeName = "";
-                    if (StringUtils.isNotEmpty(MapUtils.getString(info, "typeName"))) {
+                    if (StringUtils.isNotEmpty(MapUtils.getString(info, TYPE_NAME))) {
-                        typeName = MapUtils.getString(info, "typeName");
+                        typeName = MapUtils.getString(info, TYPE_NAME);
                     } else {
                         teamName = "其它";
                     }
@@ -258,11 +264,11 @@ public class AsyncProjectWork {
         try {
             if (StringUtils.isNotEmpty(imageData)) {
                 String img = Base64Util.getFileToBase64(imageData);
-                if (!img.startsWith("data:image")) {
+                if (!img.startsWith(DATA_IMAGE)) {
                     img = "data:image/jpg;base64," + img;
                 }
                 Map<String, Object> result2 = uploadFileService.uploadBase64Image(img);
-                if ("SUCCESS".equals(MapUtils.getString(result2, "status"))) {
+                if (SUCCESS.equals(MapUtils.getString(result2, STATUS))) {
                     Map<String, Object> dataMap = (Map<String, Object>) result2.get("data");
                     imageUrl=MapUtils.getString(dataMap, "imageUrl");
                 }

src/main/java/com/zhgd/xmgl/enums/DateUtilsTimeStrListEnum.java

@@ -53,7 +53,7 @@ public enum DateUtilsTimeStrListEnum {
     /**
      * 100：今天（每小时）
      */
-    ENUM10(100, "今天（每小时）"),
+    HOUR_OF_TODAY(100, "今天（每小时）"),
     /**
      * 200：昨天
      */

src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java

@@ -179,17 +179,20 @@ public class CarPassRecordController {
     @OperLog(operModul = "车辆通行记录管理", operType = "查询", operDesc = "接收车辆摄像头传过来的车辆通行记录")
     @ApiOperation(value = "接收车辆摄像头传过来的车辆通行记录", notes = "接收车辆摄像头传过来的车辆通行记录", httpMethod = "POST")
     @PostMapping(value = "/saveCarPassRecord")
-    public String saveCarPassRecord(String plate_num, String car_logo, String car_color, String park_id,
+    public String saveCarPassRecord(@RequestParam(name = "plate_num", required = false) String plateNum, @RequestParam(name = "car_logo", required = false) String carLogo,
-                                    String cam_id, String vdc_type, String picture, String closeup_pic, String type) {
+                                    @RequestParam(name = "car_color", required = false) String carColor, @RequestParam(name = "park_id", required = false) String parkId,
+                                    @RequestParam(name = "cam_id", required = false)String camId, @RequestParam(name = "vdc_type", required = false) String vdcType,
+                                    String picture, @RequestParam(name = "closeup_pic", required = false)String closeupPic,
+                                    String type) {
         HashMap<String, String> map = new HashMap<>(16);
-        map.put("plate_num", plate_num);
+        map.put("plate_num", plateNum);
-        map.put("car_logo", car_logo);
+        map.put("car_logo", carLogo);
-        map.put("car_color", car_color);
+        map.put("car_color", carColor);
-        map.put("park_id", park_id);
+        map.put("park_id", parkId);
-        map.put("cam_id", cam_id);
+        map.put("cam_id", camId);
-        map.put("vdc_type", vdc_type);
+        map.put("vdc_type", vdcType);
         map.put("picture", picture);
-        map.put("closeup_pic", closeup_pic);
+        map.put("closeup_pic", closeupPic);
         map.put("type", type);
         log.info("saveCarPassRecord：{}", JSON.toJSONString(map));
 
@@ -199,8 +202,8 @@ public class CarPassRecordController {
         String heartbeat = "heartbeat";
         if (online.equals(type)) {
             //log.info("全景图照片："+picture);
-            log.info("车牌号码：" + plate_num + "，车辆品牌：" + car_logo + "，车辆颜色：" + car_color + "，车场ID：" + park_id + "，出入口类型：" + vdc_type);
+            log.info("车牌号码：" + plateNum + "，车辆品牌：" + carLogo + "，车辆颜色：" + carColor + "，车场ID：" + parkId + "，出入口类型：" + vdcType);
-            Map<String, Object> resultMap = carPassRecordService.saveCameraCarPassRecord(plate_num, car_logo, car_color, park_id, cam_id, vdc_type, picture, closeup_pic);
+            Map<String, Object> resultMap = carPassRecordService.saveCameraCarPassRecord(plateNum, carLogo, carColor, parkId, camId, vdcType, picture, closeupPic);
             data.put("error_num", 0);
             data.put("error_str", "not error");
             if (resultMap != null) {
@@ -215,27 +218,27 @@ public class CarPassRecordController {
             data2.put("encodetype","hex2string");
             data2.put("data","AA55016400270001015056AF");
             list2.add(data2);*/
-            List<Map<String, Object>> list2 = getCarTitle(MapUtils.getString(resultMap, "action"), vdc_type, plate_num, MapUtils.getInteger(resultMap, "redCode")
+            List<Map<String, Object>> list2 = getCarTitle(MapUtils.getString(resultMap, "action"), vdcType, plateNum, MapUtils.getInteger(resultMap, "redCode")
                     , MapUtils.getInteger(resultMap, "systemType"));
             data.put("rs485_data", list2);
 
             log.info(JSONUtil.toJsonStr(data));
         } else if (offline.equals(type)) {
-            Map<String, Object> resultMap = carPassRecordService.saveCameraCarPassRecord(plate_num, car_logo, car_color, park_id, cam_id, vdc_type, picture, closeup_pic);
+            Map<String, Object> resultMap = carPassRecordService.saveCameraCarPassRecord(plateNum, carLogo, carColor, parkId, camId, vdcType, picture, closeupPic);
         } else if (heartbeat.equals(type)) {
             //log.info("车牌心跳" + "车场ID：" + park_id + "相机ID：" + cam_id);
             Map<String, Object> resultMap = new HashMap<>(16);
             data.put("error_num", 0);
             data.put("error_str", "not error");
             //修改车辆相机心跳时间
-            carCameraService.updateCarCamera(park_id, cam_id);
+            carCameraService.updateCarCamera(parkId, camId);
-            if (openCarMap.containsKey(cam_id)) {
+            if (openCarMap.containsKey(camId)) {
                 resultMap.put("action", "on");
                 resultMap.put("ionum", "io1");
                 List<Map<String, Object>> list = new ArrayList<>();
                 list.add(resultMap);
                 data.put("gpio_data", list);
-                openCarMap.remove(cam_id);
+                openCarMap.remove(camId);
             }
         }
 

src/main/java/com/zhgd/xmgl/modules/car/mapper/CarCameraMapper.java

@@ -1,20 +1,26 @@
 package com.zhgd.xmgl.modules.car.mapper;
 
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-import com.zhgd.xmgl.modules.car.entity.CarCamera;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhgd.xmgl.modules.car.entity.CarCamera;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Map;
 
 /**
  * @Description: 车辆相机
  * @author： pds
- * @date：   2020-09-29
+ * @date： 2020-09-29
  * @version： V1.0
  */
 @Mapper
 public interface CarCameraMapper extends BaseMapper<CarCamera> {
 
-    Map<String,Object> getCarPassRecordTotalInAndOut(Map<String, Object> map);
+    /**
+     * 统计进出数量
+     *
+     * @param map
+     * @return
+     */
+    Map<String, Object> getCarPassRecordTotalInAndOut(Map<String, Object> map);
 
 }

src/main/java/com/zhgd/xmgl/modules/car/mapper/CarVideoAirtightDataMapper.java

@@ -1,22 +1,29 @@
 package com.zhgd.xmgl.modules.car.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.xmgl.modules.car.entity.CarVideoAirtightData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 车辆-视频分析密闭运输数据
  * @author： pds
- * @date：   2021-12-03
+ * @date： 2021-12-03
  * @version： V1.0
  */
 @Mapper
 public interface CarVideoAirtightDataMapper extends BaseMapper<CarVideoAirtightData> {
 
-    List<CarVideoAirtightData> queryCarVideoAirtightDataPageList(Page<CarVideoAirtightData> page, @Param("param")Map<String, Object> map);
+    /**
+     * 分页列表查询车辆-视频分析密闭运输数据信息
+     *
+     * @param page
+     * @param map
+     * @return
+     */
+    List<CarVideoAirtightData> queryCarVideoAirtightDataPageList(Page<CarVideoAirtightData> page, @Param("param") Map<String, Object> map);
 }

src/main/java/com/zhgd/xmgl/modules/car/mapper/CarVideoWashDataMapper.java

@@ -1,22 +1,29 @@
 package com.zhgd.xmgl.modules.car.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.xmgl.modules.car.entity.CarVideoWashData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 车辆-视频分析冲洗数据
  * @author： pds
- * @date：   2021-12-03
+ * @date： 2021-12-03
  * @version： V1.0
  */
 @Mapper
 public interface CarVideoWashDataMapper extends BaseMapper<CarVideoWashData> {
 
-    List<CarVideoWashData> queryCarVideoWashDataPageList(Page<CarVideoWashData> page, @Param("param")Map<String, Object> map);
+    /**
+     * 分页列表查询车辆-视频分析冲洗数据信息
+     *
+     * @param page
+     * @param map
+     * @return
+     */
+    List<CarVideoWashData> queryCarVideoWashDataPageList(Page<CarVideoWashData> page, @Param("param") Map<String, Object> map);
 }

src/main/java/com/zhgd/xmgl/modules/car/mapper/CarWashCurrentDataMapper.java

@@ -1,23 +1,30 @@
 package com.zhgd.xmgl.modules.car.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.jeecg.common.mybatis.EntityMap;
+import com.zhgd.xmgl.modules.car.entity.CarWashCurrentData;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.jeecg.common.mybatis.EntityMap;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import com.zhgd.xmgl.modules.car.entity.CarWashCurrentData;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 /**
  * @Description: 车辆冲洗实时数据
  * @author： pds
- * @date：   2021-04-26
+ * @date： 2021-04-26
  * @version： V1.0
  */
 @Mapper
 public interface CarWashCurrentDataMapper extends BaseMapper<CarWashCurrentData> {
 
+    /**
+     * 分页列表查询车辆冲洗实时数据信息
+     *
+     * @param page
+     * @param map
+     * @return
+     */
     List<EntityMap> queryCarWashCurrentDataPageList(Page<EntityMap> page, @Param("param") Map<String, Object> map);
 }

src/main/java/com/zhgd/xmgl/modules/car/service/ICarCameraService.java

@@ -1,7 +1,7 @@
 package com.zhgd.xmgl.modules.car.service;
 
-import com.zhgd.xmgl.modules.car.entity.CarCamera;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhgd.xmgl.modules.car.entity.CarCamera;
 
 import java.util.List;
 import java.util.Map;
@@ -9,36 +9,41 @@ import java.util.Map;
 /**
  * @Description: 车辆相机
  * @author： pds
- * @date：   2020-09-29
+ * @date： 2020-09-29
  * @version： V1.0
  */
 public interface ICarCameraService extends IService<CarCamera> {
     /**
+     * 添加车辆相机信息
      *
      * @param carCamera
      */
     void addCarCamera(CarCamera carCamera);
 
     /**
+     * 编辑车辆相机信息
      *
      * @param carCamera
      */
     void editCarCamera(CarCamera carCamera);
 
     /**
+     * 修改车辆相机地图坐标
      *
      * @param list
      */
     void updateCarCameraCoordinate(List<CarCamera> list);
 
     /**
+     * 根据车辆相机统计数据
      *
      * @param map
      * @return
      */
-    Map<String,Object> selectCarStatisticsByCameraId(Map<String, Object> map);
+    Map<String, Object> selectCarStatisticsByCameraId(Map<String, Object> map);
 
     /**
+     * 更新车辆相机心跳
      *
      * @param projectSn
      * @param cameraId

src/main/java/com/zhgd/xmgl/modules/car/service/ICarInfoApprovalFlowService.java

@@ -1,8 +1,8 @@
 package com.zhgd.xmgl.modules.car.service;
 
-import com.zhgd.xmgl.modules.car.entity.CarInfoApprovalFlow;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhgd.xmgl.modules.car.entity.CarInfoApprovalFlow;
 
 import java.util.HashMap;
 import java.util.List;
@@ -15,6 +15,7 @@ import java.util.List;
  */
 public interface ICarInfoApprovalFlowService extends IService<CarInfoApprovalFlow> {
     /**
+     * 分页列表查询车辆黑白名单管理-审批流进来的车辆信息
      *
      * @param param
      * @return
@@ -22,6 +23,7 @@ public interface ICarInfoApprovalFlowService extends IService<CarInfoApprovalFlo
     IPage<CarInfoApprovalFlow> queryPageList(HashMap<String, Object> param);
 
     /**
+     * 列表查询车辆黑白名单管理-审批流进来的车辆信息
      *
      * @param param
      * @return
@@ -29,24 +31,28 @@ public interface ICarInfoApprovalFlowService extends IService<CarInfoApprovalFlo
     List<CarInfoApprovalFlow> queryList(HashMap<String, Object> param);
 
     /**
+     * 添加车辆黑白名单管理-审批流进来的车辆信息
      *
      * @param carInfoApprovalFlow
      */
     void add(CarInfoApprovalFlow carInfoApprovalFlow);
 
     /**
+     * 编辑车辆黑白名单管理-审批流进来的车辆信息
      *
      * @param carInfoApprovalFlow
      */
     void edit(CarInfoApprovalFlow carInfoApprovalFlow);
 
     /**
+     * 删除车辆黑白名单管理-审批流进来的车辆信息
      *
      * @param id
      */
     void delete(String id);
 
     /**
+     * 通过id查询车辆黑白名单管理-审批流进来的车辆信息
      *
      * @param id
      * @return

src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassGateService.java

@@ -1,7 +1,7 @@
 package com.zhgd.xmgl.modules.car.service;
 
-import com.zhgd.xmgl.modules.car.entity.CarPassGate;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhgd.xmgl.modules.car.entity.CarPassGate;
 
 import java.util.List;
 import java.util.Map;
@@ -9,11 +9,12 @@ import java.util.Map;
 /**
  * @Description: 车辆进出闸门
  * @author： pds
- * @date：   2020-09-29
+ * @date： 2020-09-29
  * @version： V1.0
  */
 public interface ICarPassGateService extends IService<CarPassGate> {
     /**
+     * 列表查询车辆进出闸门
      *
      * @param map
      * @return
@@ -21,20 +22,23 @@ public interface ICarPassGateService extends IService<CarPassGate> {
     List<CarPassGate> selectCarPassGateList(Map<String, Object> map);
 
     /**
+     * 添加车辆进出闸门信息
      *
      * @param carPassGate
      */
     void addCarPassGate(CarPassGate carPassGate);
 
     /**
+     * 编辑车辆进出闸门信息
      *
      * @param carPassGate
      */
     void editCarPassGate(CarPassGate carPassGate);
 
     /**
+     * 车辆进出闸门开闸操作
      *
      * @param map
      */
-    void openGate(Map<String, Object> map) ;
+    void openGate(Map<String, Object> map);
 }

src/main/java/com/zhgd/xmgl/modules/car/service/ICarVideoAirtightDataService.java

@@ -10,11 +10,12 @@ import java.util.Map;
 /**
  * @Description: 车辆-视频分析密闭运输数据
  * @author： pds
- * @date：   2021-12-03
+ * @date： 2021-12-03
  * @version： V1.0
  */
 public interface ICarVideoAirtightDataService extends IService<CarVideoAirtightData> {
     /**
+     * 分页列表查询车辆-视频分析密闭运输数据信息
      *
      * @param map
      * @return
@@ -22,6 +23,7 @@ public interface ICarVideoAirtightDataService extends IService<CarVideoAirtightD
     IPage<CarVideoAirtightData> queryCarVideoAirtightDataPageList(Map<String, Object> map);
 
     /**
+     * 保存视频分析车辆密闭运输结果
      *
      * @param json
      */

src/main/java/com/zhgd/xmgl/modules/car/service/ICarVideoWashDataService.java

@@ -10,11 +10,12 @@ import java.util.Map;
 /**
  * @Description: 车辆-视频分析冲洗数据
  * @author： pds
- * @date：   2021-12-03
+ * @date： 2021-12-03
  * @version： V1.0
  */
 public interface ICarVideoWashDataService extends IService<CarVideoWashData> {
     /**
+     * 分页列表查询车辆-视频分析冲洗数据信息
      *
      * @param map
      * @return
@@ -22,6 +23,7 @@ public interface ICarVideoWashDataService extends IService<CarVideoWashData> {
     IPage<CarVideoWashData> queryCarVideoWashDataPageList(Map<String, Object> map);
 
     /**
+     * 保存视频分析车辆冲洗结果
      *
      * @param json
      */

src/main/java/com/zhgd/xmgl/modules/car/service/ICarWashCurrentDataService.java

@@ -1,20 +1,21 @@
 package com.zhgd.xmgl.modules.car.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.car.entity.CarWashCurrentData;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Map;
 
 /**
  * @Description: 车辆冲洗实时数据
  * @author： pds
- * @date：   2021-04-26
+ * @date： 2021-04-26
  * @version： V1.0
  */
 public interface ICarWashCurrentDataService extends IService<CarWashCurrentData> {
     /**
+     * 分页列表查询车辆冲洗实时数据信息
      *
      * @param map
      * @return
@@ -22,12 +23,14 @@ public interface ICarWashCurrentDataService extends IService<CarWashCurrentData>
     IPage<EntityMap> queryCarWashCurrentDataPageList(Map<String, Object> map);
 
     /**
+     * 添加车辆冲洗实时数据信息
      *
      * @param carWashCurrentData
      */
     void saveCarWashCurrentData(CarWashCurrentData carWashCurrentData);
 
     /**
+     * 添加车辆未冲洗设备告警
      *
      * @param map
      */

src/main/java/com/zhgd/xmgl/modules/car/service/ICarWashDevService.java

@@ -1,15 +1,20 @@
 package com.zhgd.xmgl.modules.car.service;
 
-import com.zhgd.xmgl.modules.car.entity.CarWashDev;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhgd.xmgl.modules.car.entity.CarWashDev;
 
 /**
  * @Description: 车辆冲洗设备
  * @author： pds
- * @date：   2021-04-26
+ * @date： 2021-04-26
  * @version： V1.0
  */
 public interface ICarWashDevService extends IService<CarWashDev> {
 
+    /**
+     * 添加车辆冲洗设备信息
+     *
+     * @param carWashDev
+     */
     void saveCarWashDev(CarWashDev carWashDev);
 }

src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java

@@ -14,6 +14,7 @@ import com.zhgd.mqtt.server.IMqttSender;
 import com.zhgd.xmgl.async.AsyncCar;
 import com.zhgd.xmgl.async.AsyncSendAttendance;
 import com.zhgd.xmgl.constant.Cts;
+import com.zhgd.xmgl.enums.DateUtilsTimeStrListEnum;
 import com.zhgd.xmgl.modules.basicdata.entity.Notice;
 import com.zhgd.xmgl.modules.basicdata.service.ICompanyService;
 import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
@@ -59,6 +60,9 @@ import java.util.stream.Collectors;
 @Transactional(rollbackFor = Exception.class)
 @Slf4j
 public class CarPassRecordServiceImpl extends ServiceImpl<CarPassRecordMapper, CarPassRecord> implements ICarPassRecordService {
+    public static final String DATA_IMAGE = "data:image";
+    public static final String STRING = "[]";
+    public static final String HH_MM = "HH:mm";
     @Autowired
     IMqttSender mqttSender;
     @Autowired
@@ -140,7 +144,7 @@ public class CarPassRecordServiceImpl extends ServiceImpl<CarPassRecordMapper, C
         String status = "status";
         if (StringUtils.isNotEmpty(picture)) {
             picture = picture.replace("-", "+").replace("_", "/").replace(".", "=");
-            String prefix = "data:image";
+            String prefix = DATA_IMAGE;
             if (!picture.startsWith(prefix)) {
                 picture = "data:image/jpg;base64," + picture;
             }
@@ -153,7 +157,7 @@ public class CarPassRecordServiceImpl extends ServiceImpl<CarPassRecordMapper, C
         }
         if (StringUtils.isNotEmpty(closeupPic)) {
             closeupPic = closeupPic.replace("-", "+").replace("_", "/").replace(".", "=");
-            if (!closeupPic.startsWith("data:image")) {
+            if (!closeupPic.startsWith(DATA_IMAGE)) {
                 closeupPic = "data:image/jpg;base64," + closeupPic;
             }
             Map<String, Object> result2 = uploadFileService.uploadBase64Image(closeupPic);
@@ -233,7 +237,7 @@ public class CarPassRecordServiceImpl extends ServiceImpl<CarPassRecordMapper, C
 
     private void sendSms(CarPassRecord carPassRecord, String alarmPushPhone) {
         try {
-            if (StringUtils.isNotEmpty(alarmPushPhone) && alarmPushPhone.length() > 0 && !"[]".equals(alarmPushPhone)) {
+            if (StringUtils.isNotEmpty(alarmPushPhone) && alarmPushPhone.length() > 0 && !STRING.equals(alarmPushPhone)) {
                 JSONArray array = JSONArray.parseArray(alarmPushPhone);
                 String signature = "华为云短信测试";
                 //短信模板ID
@@ -330,7 +334,7 @@ public class CarPassRecordServiceImpl extends ServiceImpl<CarPassRecordMapper, C
                     if (redWorkerName.length() > 0) {
                         title.append("其中存在健康码为红码人员，分别为：").append(redWorkerName.toString()).append("。");
                     }
-                    for (String userId : carInfo.getAlarmPushWorkerId().split(",")) {
+                    for (String userId : carInfo.getAlarmPushWorkerId().split(Cts.COMMA)) {
                         //发生通知
                         addNotice(Long.valueOf(userId), title.toString(), title.toString(), sdf.format(new Date()), "3");
                     }
@@ -412,7 +416,7 @@ public class CarPassRecordServiceImpl extends ServiceImpl<CarPassRecordMapper, C
     private void fillDataCarPassRecordInOutCount(List<TodayOutInNumber> todayOutInNumbers) {
         Map<String, TodayOutInNumber> map = todayOutInNumbers.stream().collect(Collectors.toMap(TodayOutInNumber::getPassTime, Function.identity()));
         todayOutInNumbers.clear();
-        for (String h : DateUtils.getDateTimeStrList(100, "HH:mm")) {
+        for (String h : DateUtils.getDateTimeStrList(DateUtilsTimeStrListEnum.HOUR_OF_TODAY.getCode(), HH_MM)) {
             TodayOutInNumber toi = map.get(h);
             if (toi == null) {
                 toi = new TodayOutInNumber();

src/main/java/com/zhgd/xmgl/modules/worker/enums/WorkerInfoPersonTypeEnum.java

@@ -0,0 +1,25 @@
+package com.zhgd.xmgl.modules.worker.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum WorkerInfoPersonTypeEnum {
+    /**
+     * 劳务人员
+     */
+    WORKER(1, "劳务人员"),
+    /**
+     * 管理人员
+     */
+    MANAGER(2, "管理人员"),
+    /**
+     * 临时人员
+     */
+    TEMP(3, "临时人员");
+
+    private final Integer code;
+    private final String desc;
+
+}