格式化

airport-admin/src/main/java/com/sundot/airport/web/controller/blocked/BlockedLuggagePieceDailyController.java

@@ -2,6 +2,7 @@ package com.sundot.airport.web.controller.blocked;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,14 +25,13 @@ import com.sundot.airport.common.core.page.TableDataInfo;
 
 /**
  * 每日各时段查堵行李Controller
- * 
+ *
  * @author wangxx
  * @date 2026-04-13
  */
 @RestController
 @RequestMapping("/blocked/pieceDaily")
-public class BlockedLuggagePieceDailyController extends BaseController
-{
+public class BlockedLuggagePieceDailyController extends BaseController {
     @Autowired
     private IBlockedLuggagePieceDailyService blockedLuggagePieceDailyService;
 
@@ -40,8 +40,7 @@ public class BlockedLuggagePieceDailyController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('blocked:pieceDaily:list')")
     @GetMapping("/list")
-    public TableDataInfo list(BlockedLuggagePieceDaily blockedLuggagePieceDaily)
-    {
+    public TableDataInfo list(BlockedLuggagePieceDaily blockedLuggagePieceDaily) {
         startPage();
         List<BlockedLuggagePieceDaily> list = blockedLuggagePieceDailyService.selectBlockedLuggagePieceDailyList(blockedLuggagePieceDaily);
         return getDataTable(list);
@@ -53,8 +52,7 @@ public class BlockedLuggagePieceDailyController extends BaseController
     @PreAuthorize("@ss.hasPermi('blocked:pieceDaily:export')")
     @Log(title = "每日各时段查堵行李", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BlockedLuggagePieceDaily blockedLuggagePieceDaily)
-    {
+    public void export(HttpServletResponse response, BlockedLuggagePieceDaily blockedLuggagePieceDaily) {
         List<BlockedLuggagePieceDaily> list = blockedLuggagePieceDailyService.selectBlockedLuggagePieceDailyList(blockedLuggagePieceDaily);
         ExcelUtil<BlockedLuggagePieceDaily> util = new ExcelUtil<BlockedLuggagePieceDaily>(BlockedLuggagePieceDaily.class);
         util.exportExcel(response, list, "每日各时段查堵行李数据");
@@ -66,8 +64,7 @@ public class BlockedLuggagePieceDailyController extends BaseController
     @PreAuthorize("@ss.hasPermi('blocked:pieceDaily:import')")
     @Log(title = "每日各时段查堵行李", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<BlockedLuggagePieceDaily> util = new ExcelUtil<BlockedLuggagePieceDaily>(BlockedLuggagePieceDaily.class);
         List<BlockedLuggagePieceDaily> list = util.importExcel(file.getInputStream());
         String message = blockedLuggagePieceDailyService.importData(list, updateSupport);
@@ -78,8 +75,7 @@ public class BlockedLuggagePieceDailyController extends BaseController
      * 获取导入模板
      */
     @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response)
-    {
+    public void importTemplate(HttpServletResponse response) {
         ExcelUtil<BlockedLuggagePieceDaily> util = new ExcelUtil<BlockedLuggagePieceDaily>(BlockedLuggagePieceDaily.class);
         util.importTemplateExcel(response, "每日各时段查堵行李数据");
     }
@@ -89,8 +85,7 @@ public class BlockedLuggagePieceDailyController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('blocked:pieceDaily:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(blockedLuggagePieceDailyService.selectBlockedLuggagePieceDailyById(id));
     }
 
@@ -99,11 +94,9 @@ public class BlockedLuggagePieceDailyController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('blocked:pieceDaily:add')")
     @GetMapping("/checkDuplicate")
-    public AjaxResult checkDuplicate(BlockedLuggagePieceDaily blockedLuggagePieceDaily)
-    {
+    public AjaxResult checkDuplicate(BlockedLuggagePieceDaily blockedLuggagePieceDaily) {
         BlockedLuggagePieceDaily duplicate = blockedLuggagePieceDailyService.checkDuplicate(blockedLuggagePieceDaily);
-        if (duplicate != null)
-        {
+        if (duplicate != null) {
             return AjaxResult.warn("数据已存在，是否覆盖？", duplicate);
         }
         return success();
@@ -115,8 +108,7 @@ public class BlockedLuggagePieceDailyController extends BaseController
     @PreAuthorize("@ss.hasPermi('blocked:pieceDaily:add')")
     @Log(title = "每日各时段查堵行李", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody BlockedLuggagePieceDaily blockedLuggagePieceDaily)
-    {
+    public AjaxResult add(@RequestBody BlockedLuggagePieceDaily blockedLuggagePieceDaily) {
         blockedLuggagePieceDaily.setCreateBy(getUsername());
         return toAjax(blockedLuggagePieceDailyService.insertBlockedLuggagePieceDaily(blockedLuggagePieceDaily));
     }
@@ -127,8 +119,7 @@ public class BlockedLuggagePieceDailyController extends BaseController
     @PreAuthorize("@ss.hasPermi('blocked:pieceDaily:add')")
     @Log(title = "每日各时段查堵行李", businessType = BusinessType.INSERT)
     @PostMapping("/addOrOverwrite")
-    public AjaxResult addOrOverwrite(@RequestBody BlockedLuggagePieceDaily blockedLuggagePieceDaily)
-    {
+    public AjaxResult addOrOverwrite(@RequestBody BlockedLuggagePieceDaily blockedLuggagePieceDaily) {
         blockedLuggagePieceDaily.setCreateBy(getUsername());
         blockedLuggagePieceDaily.setUpdateBy(getUsername());
         return toAjax(blockedLuggagePieceDailyService.insertOrUpdate(blockedLuggagePieceDaily));
@@ -140,8 +131,7 @@ public class BlockedLuggagePieceDailyController extends BaseController
     @PreAuthorize("@ss.hasPermi('blocked:pieceDaily:edit')")
     @Log(title = "每日各时段查堵行李", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody BlockedLuggagePieceDaily blockedLuggagePieceDaily)
-    {
+    public AjaxResult edit(@RequestBody BlockedLuggagePieceDaily blockedLuggagePieceDaily) {
         blockedLuggagePieceDaily.setUpdateBy(getUsername());
         return toAjax(blockedLuggagePieceDailyService.updateBlockedLuggagePieceDaily(blockedLuggagePieceDaily));
     }
@@ -152,8 +142,7 @@ public class BlockedLuggagePieceDailyController extends BaseController
     @PreAuthorize("@ss.hasPermi('blocked:pieceDaily:remove')")
     @Log(title = "每日各时段查堵行李", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(blockedLuggagePieceDailyService.deleteBlockedLuggagePieceDailyByIds(ids));
     }
 }

airport-blocked/src/main/java/com/sundot/airport/blocked/domain/BlockedLuggagePieceDaily.java

@@ -2,6 +2,7 @@ package com.sundot.airport.blocked.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -11,12 +12,11 @@ import com.sundot.airport.common.core.domain.BaseEntity;
 
 /**
  * 每日各时段查堵行李对象 blocked_luggage_piece_daily
- * 
+ *
  * @author wangxx
  * @date 2026-04-13
  */
-public class BlockedLuggagePieceDaily extends BaseEntity
-{
+public class BlockedLuggagePieceDaily extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 主键ID */
@@ -102,201 +102,167 @@ public class BlockedLuggagePieceDaily extends BaseEntity
     @ApiModelProperty("删除标志")
     private String delFlag;
 
-    public void setId(Long id) 
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
 
-    public void setStatDate(Date statDate) 
-    {
+    public void setStatDate(Date statDate) {
         this.statDate = statDate;
     }
 
-    public Date getStatDate() 
-    {
+    public Date getStatDate() {
         return statDate;
     }
 
-    public void setBrigadeId(Long brigadeId) 
-    {
+    public void setBrigadeId(Long brigadeId) {
         this.brigadeId = brigadeId;
     }
 
-    public Long getBrigadeId() 
-    {
+    public Long getBrigadeId() {
         return brigadeId;
     }
 
-    public void setBrigadeName(String brigadeName) 
-    {
+    public void setBrigadeName(String brigadeName) {
         this.brigadeName = brigadeName;
     }
 
-    public String getBrigadeName() 
-    {
+    public String getBrigadeName() {
         return brigadeName;
     }
 
-    public void setTimePeriod(String timePeriod) 
-    {
+    public void setTimePeriod(String timePeriod) {
         this.timePeriod = timePeriod;
     }
 
-    public String getTimePeriod() 
-    {
+    public String getTimePeriod() {
         return timePeriod;
     }
 
-    public void setT1WalkBagCount(Integer t1WalkBagCount) 
-    {
+    public void setT1WalkBagCount(Integer t1WalkBagCount) {
         this.t1WalkBagCount = t1WalkBagCount;
     }
 
-    public Integer getT1WalkBagCount() 
-    {
+    public Integer getT1WalkBagCount() {
         return t1WalkBagCount;
     }
 
-    public void setT1WalkBlockedCount(Integer t1WalkBlockedCount) 
-    {
+    public void setT1WalkBlockedCount(Integer t1WalkBlockedCount) {
         this.t1WalkBlockedCount = t1WalkBlockedCount;
     }
 
-    public Integer getT1WalkBlockedCount() 
-    {
+    public Integer getT1WalkBlockedCount() {
         return t1WalkBlockedCount;
     }
 
-    public void setT2WalkBagCount(Integer t2WalkBagCount) 
-    {
+    public void setT2WalkBagCount(Integer t2WalkBagCount) {
         this.t2WalkBagCount = t2WalkBagCount;
     }
 
-    public Integer getT2WalkBagCount() 
-    {
+    public Integer getT2WalkBagCount() {
         return t2WalkBagCount;
     }
 
-    public void setT2WalkBlockedCount(Integer t2WalkBlockedCount) 
-    {
+    public void setT2WalkBlockedCount(Integer t2WalkBlockedCount) {
         this.t2WalkBlockedCount = t2WalkBlockedCount;
     }
 
-    public Integer getT2WalkBlockedCount() 
-    {
+    public Integer getT2WalkBlockedCount() {
         return t2WalkBlockedCount;
     }
 
-    public void setT1TravelBagCount(Integer t1TravelBagCount) 
-    {
+    public void setT1TravelBagCount(Integer t1TravelBagCount) {
         this.t1TravelBagCount = t1TravelBagCount;
     }
 
-    public Integer getT1TravelBagCount() 
-    {
+    public Integer getT1TravelBagCount() {
         return t1TravelBagCount;
     }
 
-    public void setT1TravelBlockedCount(Integer t1TravelBlockedCount) 
-    {
+    public void setT1TravelBlockedCount(Integer t1TravelBlockedCount) {
         this.t1TravelBlockedCount = t1TravelBlockedCount;
     }
 
-    public Integer getT1TravelBlockedCount() 
-    {
+    public Integer getT1TravelBlockedCount() {
         return t1TravelBlockedCount;
     }
 
-    public void setT2TravelBagCount(Integer t2TravelBagCount) 
-    {
+    public void setT2TravelBagCount(Integer t2TravelBagCount) {
         this.t2TravelBagCount = t2TravelBagCount;
     }
 
-    public Integer getT2TravelBagCount() 
-    {
+    public Integer getT2TravelBagCount() {
         return t2TravelBagCount;
     }
 
-    public void setT2TravelBlockedCount(Integer t2TravelBlockedCount) 
-    {
+    public void setT2TravelBlockedCount(Integer t2TravelBlockedCount) {
         this.t2TravelBlockedCount = t2TravelBlockedCount;
     }
 
-    public Integer getT2TravelBlockedCount() 
-    {
+    public Integer getT2TravelBlockedCount() {
         return t2TravelBlockedCount;
     }
 
-    public void setTotalLuggageCount(Integer totalLuggageCount) 
-    {
+    public void setTotalLuggageCount(Integer totalLuggageCount) {
         this.totalLuggageCount = totalLuggageCount;
     }
 
-    public Integer getTotalLuggageCount() 
-    {
+    public Integer getTotalLuggageCount() {
         return totalLuggageCount;
     }
 
-    public void setTotalBlockedCount(Integer totalBlockedCount) 
-    {
+    public void setTotalBlockedCount(Integer totalBlockedCount) {
         this.totalBlockedCount = totalBlockedCount;
     }
 
-    public Integer getTotalBlockedCount() 
-    {
+    public Integer getTotalBlockedCount() {
         return totalBlockedCount;
     }
 
-    public void setBlockedRate(BigDecimal blockedRate) 
-    {
+    public void setBlockedRate(BigDecimal blockedRate) {
         this.blockedRate = blockedRate;
     }
 
-    public BigDecimal getBlockedRate() 
-    {
+    public BigDecimal getBlockedRate() {
         return blockedRate;
     }
 
-    public void setDelFlag(String delFlag) 
-    {
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
 
-    public String getDelFlag() 
-    {
+    public String getDelFlag() {
         return delFlag;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("statDate", getStatDate())
-            .append("brigadeId", getBrigadeId())
-            .append("brigadeName", getBrigadeName())
-            .append("timePeriod", getTimePeriod())
-            .append("t1WalkBagCount", getT1WalkBagCount())
-            .append("t1WalkBlockedCount", getT1WalkBlockedCount())
-            .append("t2WalkBagCount", getT2WalkBagCount())
-            .append("t2WalkBlockedCount", getT2WalkBlockedCount())
-            .append("t1TravelBagCount", getT1TravelBagCount())
-            .append("t1TravelBlockedCount", getT1TravelBlockedCount())
-            .append("t2TravelBagCount", getT2TravelBagCount())
-            .append("t2TravelBlockedCount", getT2TravelBlockedCount())
-            .append("totalLuggageCount", getTotalLuggageCount())
-            .append("totalBlockedCount", getTotalBlockedCount())
-            .append("blockedRate", getBlockedRate())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+                .append("id", getId())
+                .append("statDate", getStatDate())
+                .append("brigadeId", getBrigadeId())
+                .append("brigadeName", getBrigadeName())
+                .append("timePeriod", getTimePeriod())
+                .append("t1WalkBagCount", getT1WalkBagCount())
+                .append("t1WalkBlockedCount", getT1WalkBlockedCount())
+                .append("t2WalkBagCount", getT2WalkBagCount())
+                .append("t2WalkBlockedCount", getT2WalkBlockedCount())
+                .append("t1TravelBagCount", getT1TravelBagCount())
+                .append("t1TravelBlockedCount", getT1TravelBlockedCount())
+                .append("t2TravelBagCount", getT2TravelBagCount())
+                .append("t2TravelBlockedCount", getT2TravelBlockedCount())
+                .append("totalLuggageCount", getTotalLuggageCount())
+                .append("totalBlockedCount", getTotalBlockedCount())
+                .append("blockedRate", getBlockedRate())
+                .append("delFlag", getDelFlag())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

airport-blocked/src/main/java/com/sundot/airport/blocked/mapper/BlockedLuggagePieceDailyMapper.java

@@ -1,19 +1,19 @@
 package com.sundot.airport.blocked.mapper;
 
 import java.util.List;
+
 import com.sundot.airport.blocked.domain.BlockedLuggagePieceDaily;
 
 /**
  * 每日各时段查堵行李Mapper接口
- * 
+ *
  * @author wangxx
  * @date 2026-04-13
  */
-public interface BlockedLuggagePieceDailyMapper 
-{
+public interface BlockedLuggagePieceDailyMapper {
     /**
      * 查询每日行李过检查堵件数统计
-     * 
+     *
      * @param id 每日行李过检查堵件数统计主键
      * @return 每日行李过检查堵件数统计
      */
@@ -21,7 +21,7 @@ public interface BlockedLuggagePieceDailyMapper
 
     /**
      * 查询每日行李过检查堵件数统计列表
-     * 
+     *
      * @param blockedLuggagePieceDaily 每日行李过检查堵件数统计
      * @return 每日行李过检查堵件数统计集合
      */
@@ -29,7 +29,7 @@ public interface BlockedLuggagePieceDailyMapper
 
     /**
      * 新增每日行李过检查堵件数统计
-     * 
+     *
      * @param blockedLuggagePieceDaily 每日行李过检查堵件数统计
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface BlockedLuggagePieceDailyMapper
 
     /**
      * 修改每日行李过检查堵件数统计
-     * 
+     *
      * @param blockedLuggagePieceDaily 每日行李过检查堵件数统计
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface BlockedLuggagePieceDailyMapper
 
     /**
      * 删除每日行李过检查堵件数统计
-     * 
+     *
      * @param id 每日行李过检查堵件数统计主键
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface BlockedLuggagePieceDailyMapper
 
     /**
      * 批量删除每日行李过检查堵件数统计
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

airport-blocked/src/main/java/com/sundot/airport/blocked/service/IBlockedLuggagePieceDailyService.java

@@ -1,19 +1,19 @@
 package com.sundot.airport.blocked.service;
 
 import java.util.List;
+
 import com.sundot.airport.blocked.domain.BlockedLuggagePieceDaily;
 
 /**
  * 每日各时段查堵行李Service接口
- * 
+ *
  * @author wangxx
  * @date 2026-04-13
  */
-public interface IBlockedLuggagePieceDailyService 
-{
+public interface IBlockedLuggagePieceDailyService {
     /**
      * 查询每日各时段查堵行李
-     * 
+     *
      * @param id 每日各时段查堵行李主键
      * @return 每日各时段查堵行李
      */
@@ -21,7 +21,7 @@ public interface IBlockedLuggagePieceDailyService
 
     /**
      * 查询每日各时段查堵行李列表
-     * 
+     *
      * @param blockedLuggagePieceDaily 每日各时段查堵行李
      * @return 每日各时段查堵行李集合
      */
@@ -29,7 +29,7 @@ public interface IBlockedLuggagePieceDailyService
 
     /**
      * 新增每日各时段查堵行李
-     * 
+     *
      * @param blockedLuggagePieceDaily 每日各时段查堵行李
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface IBlockedLuggagePieceDailyService
 
     /**
      * 修改每日各时段查堵行李
-     * 
+     *
      * @param blockedLuggagePieceDaily 每日各时段查堵行李
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IBlockedLuggagePieceDailyService
 
     /**
      * 批量删除每日各时段查堵行李
-     * 
+     *
      * @param ids 需要删除的每日各时段查堵行李主键集合
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface IBlockedLuggagePieceDailyService
 
     /**
      * 删除每日各时段查堵行李信息
-     * 
+     *
      * @param id 每日各时段查堵行李主键
      * @return 结果
      */
@@ -61,7 +61,7 @@ public interface IBlockedLuggagePieceDailyService
 
     /**
      * 导入每日各时段查堵行李数据
-     * 
+     *
      * @param list 数据列表
      * @param updateSupport 是否更新支持
      * @return 导入结果信息
@@ -70,7 +70,7 @@ public interface IBlockedLuggagePieceDailyService
 
     /**
      * 检查数据是否重复
-     * 
+     *
      * @param blockedLuggagePieceDaily 统计数据
      * @return 重复的数据，如果没有重复返回null
      */
@@ -78,7 +78,7 @@ public interface IBlockedLuggagePieceDailyService
 
     /**
      * 新增或更新每日各时段查堵行李（如果数据重复则覆盖更新）
-     * 
+     *
      * @param blockedLuggagePieceDaily 每日各时段查堵行李
      * @return 结果
      */

airport-blocked/src/main/java/com/sundot/airport/blocked/service/impl/BlockedLuggagePieceDailyServiceImpl.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Date;
 import java.util.List;
+
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
@@ -20,13 +21,12 @@ import com.sundot.airport.system.service.ISysDeptService;
 
 /**
  * 每日各时段查堵行李Service业务层处理
- * 
+ *
  * @author wangxx
  * @date 2026-04-13
  */
 @Service
-public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePieceDailyService 
-{
+public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePieceDailyService {
     @Autowired
     private BlockedLuggagePieceDailyMapper blockedLuggagePieceDailyMapper;
 
@@ -35,38 +35,35 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
 
     /**
      * 查询每日各时段查堵行李
-     * 
+     *
      * @param id 每日各时段查堵行李主键
      * @return 每日各时段查堵行李
      */
     @Override
-    public BlockedLuggagePieceDaily selectBlockedLuggagePieceDailyById(Long id)
-    {
+    public BlockedLuggagePieceDaily selectBlockedLuggagePieceDailyById(Long id) {
         return blockedLuggagePieceDailyMapper.selectBlockedLuggagePieceDailyById(id);
     }
 
     /**
      * 查询每日各时段查堵行李列表
-     * 
+     *
      * @param blockedLuggagePieceDaily 每日各时段查堵行李
      * @return 每日各时段查堵行李
      */
     @Override
-    public List<BlockedLuggagePieceDaily> selectBlockedLuggagePieceDailyList(BlockedLuggagePieceDaily blockedLuggagePieceDaily)
-    {
+    public List<BlockedLuggagePieceDaily> selectBlockedLuggagePieceDailyList(BlockedLuggagePieceDaily blockedLuggagePieceDaily) {
         return blockedLuggagePieceDailyMapper.selectBlockedLuggagePieceDailyList(blockedLuggagePieceDaily);
     }
 
     /**
      * 新增每日各时段查堵行李
-     * 
+     *
      * @param blockedLuggagePieceDaily 每日各时段查堵行李
      * @return 结果
      */
     @Override
     @Transactional
-    public int insertBlockedLuggagePieceDaily(BlockedLuggagePieceDaily blockedLuggagePieceDaily)
-    {
+    public int insertBlockedLuggagePieceDaily(BlockedLuggagePieceDaily blockedLuggagePieceDaily) {
         // 根据大队名称填充ID
         fillBrigadeIdByName(blockedLuggagePieceDaily);
         calculateAndSetFields(blockedLuggagePieceDaily);
@@ -75,14 +72,13 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
 
     /**
      * 修改每日各时段查堵行李
-     * 
+     *
      * @param blockedLuggagePieceDaily 每日各时段查堵行李
      * @return 结果
      */
     @Override
     @Transactional
-    public int updateBlockedLuggagePieceDaily(BlockedLuggagePieceDaily blockedLuggagePieceDaily)
-    {
+    public int updateBlockedLuggagePieceDaily(BlockedLuggagePieceDaily blockedLuggagePieceDaily) {
         // 根据大队名称填充ID
         fillBrigadeIdByName(blockedLuggagePieceDaily);
         calculateAndSetFields(blockedLuggagePieceDaily);
@@ -91,41 +87,37 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
 
     /**
      * 批量删除每日各时段查堵行李
-     * 
+     *
      * @param ids 需要删除的每日各时段查堵行李主键
      * @return 结果
      */
     @Override
-    public int deleteBlockedLuggagePieceDailyByIds(Long[] ids)
-    {
+    public int deleteBlockedLuggagePieceDailyByIds(Long[] ids) {
         return blockedLuggagePieceDailyMapper.deleteBlockedLuggagePieceDailyByIds(ids);
     }
 
     /**
      * 删除每日各时段查堵行李信息
-     * 
+     *
      * @param id 每日各时段查堵行李主键
      * @return 结果
      */
     @Override
-    public int deleteBlockedLuggagePieceDailyById(Long id)
-    {
+    public int deleteBlockedLuggagePieceDailyById(Long id) {
         return blockedLuggagePieceDailyMapper.deleteBlockedLuggagePieceDailyById(id);
     }
 
     /**
      * 导入每日各时段查堵行李数据
-     * 
+     *
      * @param list 数据列表
      * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
      * @return 结果
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public String importData(List<BlockedLuggagePieceDaily> list, boolean isUpdateSupport)
-    {
-        if (CollUtil.isEmpty(list))
-        {
+    public String importData(List<BlockedLuggagePieceDaily> list, boolean isUpdateSupport) {
+        if (CollUtil.isEmpty(list)) {
             throw new ServiceException("导入每日各时段查堵行李数据不能为空！");
         }
 
@@ -133,52 +125,44 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
-        
-        for (BlockedLuggagePieceDaily data : list)
-        {
-            try
-            {
+
+        for (BlockedLuggagePieceDaily data : list) {
+            try {
                 // 根据大队名称填充ID
                 fillBrigadeIdByName(data);
-                
+
                 // 数据校验
-                if (ObjUtil.isNull(data.getStatDate()))
-                {
+                if (ObjUtil.isNull(data.getStatDate())) {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、统计日期不能为空");
                     continue;
                 }
-                if (ObjUtil.isNull(data.getBrigadeId()))
-                {
+                if (ObjUtil.isNull(data.getBrigadeId())) {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、大队ID不能为空");
                     continue;
                 }
-                if (StrUtil.isBlank(data.getTimePeriod()))
-                {
+                if (StrUtil.isBlank(data.getTimePeriod())) {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、时间段不能为空");
                     continue;
                 }
-                
+
                 // 查询是否已存在（根据日期+大队ID+时间段唯一）
                 BlockedLuggagePieceDaily queryParam = new BlockedLuggagePieceDaily();
                 queryParam.setStatDate(data.getStatDate());
                 queryParam.setBrigadeId(data.getBrigadeId());
                 queryParam.setTimePeriod(data.getTimePeriod());
                 List<BlockedLuggagePieceDaily> existingList = blockedLuggagePieceDailyMapper.selectBlockedLuggagePieceDailyList(queryParam);
-                
-                if (CollUtil.isEmpty(existingList))
-                {
+
+                if (CollUtil.isEmpty(existingList)) {
                     // 新增
                     data.setCreateTime(DateUtils.getNowDate());
                     calculateAndSetFields(data);
                     blockedLuggagePieceDailyMapper.insertBlockedLuggagePieceDaily(data);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、统计日期【" + data.getStatDate() + "】、大队【" + data.getBrigadeName() + "】、时间段【" + data.getTimePeriod() + "】导入成功");
-                }
-                else if (isUpdateSupport)
-                {
+                } else if (isUpdateSupport) {
                     // 更新
                     BlockedLuggagePieceDaily old = existingList.get(0);
                     data.setId(old.getId());
@@ -187,28 +171,21 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
                     blockedLuggagePieceDailyMapper.updateBlockedLuggagePieceDaily(data);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、统计日期【" + data.getStatDate() + "】、大队【" + data.getBrigadeName() + "】、时间段【" + data.getTimePeriod() + "】更新成功");
-                }
-                else
-                {
+                } else {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、大队【" + data.getBrigadeName() + "】、时间段【" + data.getTimePeriod() + "】已存在");
                 }
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 failureNum++;
                 String msg = "<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】导入失败：";
                 failureMsg.append(msg + e.getMessage());
             }
         }
-        
-        if (failureNum > 0)
-        {
+
+        if (failureNum > 0) {
             failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new ServiceException(failureMsg.toString());
-        }
-        else
-        {
+        } else {
             successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
         }
         return successMsg.toString();
@@ -216,28 +193,25 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
 
     /**
      * 检查数据是否重复
-     * 
+     *
      * @param blockedLuggagePieceDaily 统计数据
      * @return 重复的数据，如果没有重复返回null
      */
     @Override
-    public BlockedLuggagePieceDaily checkDuplicate(BlockedLuggagePieceDaily blockedLuggagePieceDaily)
-    {
+    public BlockedLuggagePieceDaily checkDuplicate(BlockedLuggagePieceDaily blockedLuggagePieceDaily) {
         if (ObjUtil.isNull(blockedLuggagePieceDaily.getStatDate())
                 || ObjUtil.isNull(blockedLuggagePieceDaily.getBrigadeId())
-                || ObjUtil.isNull(blockedLuggagePieceDaily.getTimePeriod()))
-        {
+                || ObjUtil.isNull(blockedLuggagePieceDaily.getTimePeriod())) {
             return null;
         }
-        
+
         BlockedLuggagePieceDaily queryParam = new BlockedLuggagePieceDaily();
         queryParam.setStatDate(blockedLuggagePieceDaily.getStatDate());
         queryParam.setBrigadeId(blockedLuggagePieceDaily.getBrigadeId());
         queryParam.setTimePeriod(blockedLuggagePieceDaily.getTimePeriod());
         List<BlockedLuggagePieceDaily> existingList = blockedLuggagePieceDailyMapper.selectBlockedLuggagePieceDailyList(queryParam);
-        
-        if (CollUtil.isNotEmpty(existingList))
-        {
+
+        if (CollUtil.isNotEmpty(existingList)) {
             return existingList.get(0);
         }
         return null;
@@ -245,30 +219,26 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
 
     /**
      * 新增或更新每日各时段查堵行李（如果数据重复则覆盖更新）
-     * 
+     *
      * @param blockedLuggagePieceDaily 每日各时段查堵行李
      * @return 结果
      */
     @Override
     @Transactional
-    public int insertOrUpdate(BlockedLuggagePieceDaily blockedLuggagePieceDaily)
-    {
+    public int insertOrUpdate(BlockedLuggagePieceDaily blockedLuggagePieceDaily) {
         // 检查是否重复
         BlockedLuggagePieceDaily existing = checkDuplicate(blockedLuggagePieceDaily);
         // 根据大队名称填充ID
         fillBrigadeIdByName(blockedLuggagePieceDaily);
-        if (existing != null)
-        {
+        if (existing != null) {
             // 数据已存在，执行更新（覆盖）
             blockedLuggagePieceDaily.setId(existing.getId());
-            blockedLuggagePieceDaily.setUpdateBy(blockedLuggagePieceDaily.getUpdateBy() != null 
+            blockedLuggagePieceDaily.setUpdateBy(blockedLuggagePieceDaily.getUpdateBy() != null
                     ? blockedLuggagePieceDaily.getUpdateBy() : blockedLuggagePieceDaily.getCreateBy());
 
             calculateAndSetFields(blockedLuggagePieceDaily);
             return blockedLuggagePieceDailyMapper.updateBlockedLuggagePieceDaily(blockedLuggagePieceDaily);
-        }
-        else
-        {
+        } else {
             // 数据不存在，执行新增
             calculateAndSetFields(blockedLuggagePieceDaily);
             return blockedLuggagePieceDailyMapper.insertBlockedLuggagePieceDaily(blockedLuggagePieceDaily);
@@ -277,39 +247,37 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
 
     /**
      * 计算并设置所有计算字段
-     * 
+     *
      * @param data 统计数据
      */
-    private void calculateAndSetFields(BlockedLuggagePieceDaily data)
-    {
+    private void calculateAndSetFields(BlockedLuggagePieceDaily data) {
         // 初始化默认值
         initDefaultValues(data);
-        
+
         // 计算过检行李数
         Integer totalLuggage = (data.getT1WalkBagCount() != null ? data.getT1WalkBagCount() : 0)
                 + (data.getT2WalkBagCount() != null ? data.getT2WalkBagCount() : 0)
                 + (data.getT1TravelBagCount() != null ? data.getT1TravelBagCount() : 0)
                 + (data.getT2TravelBagCount() != null ? data.getT2TravelBagCount() : 0);
         data.setTotalLuggageCount(totalLuggage);
-        
+
         // 计算时段查堵件数
         Integer totalBlocked = (data.getT1WalkBlockedCount() != null ? data.getT1WalkBlockedCount() : 0)
                 + (data.getT2WalkBlockedCount() != null ? data.getT2WalkBlockedCount() : 0)
                 + (data.getT1TravelBlockedCount() != null ? data.getT1TravelBlockedCount() : 0)
                 + (data.getT2TravelBlockedCount() != null ? data.getT2TravelBlockedCount() : 0);
         data.setTotalBlockedCount(totalBlocked);
-        
+
         // 计算查堵万分率
         data.setBlockedRate(calculateBlockRate(totalBlocked, totalLuggage));
     }
-    
+
     /**
      * 初始化默认值
-     * 
+     *
      * @param data 统计数据
      */
-    private void initDefaultValues(BlockedLuggagePieceDaily data)
-    {
+    private void initDefaultValues(BlockedLuggagePieceDaily data) {
         if (data.getT1WalkBagCount() == null) data.setT1WalkBagCount(0);
         if (data.getT1WalkBlockedCount() == null) data.setT1WalkBlockedCount(0);
         if (data.getT2WalkBagCount() == null) data.setT2WalkBagCount(0);
@@ -319,22 +287,19 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
         if (data.getT2TravelBagCount() == null) data.setT2TravelBagCount(0);
         if (data.getT2TravelBlockedCount() == null) data.setT2TravelBlockedCount(0);
     }
-    
+
     /**
      * 计算万分率（查堵件数/过检行李数*10000）
-     * 
+     *
      * @param blockedCount 查堵件数
      * @param luggageCount 过检行李数
      * @return 万分率
      */
-    private BigDecimal calculateBlockRate(Integer blockedCount, Integer luggageCount)
-    {
-        if (luggageCount == null || luggageCount == 0)
-        {
+    private BigDecimal calculateBlockRate(Integer blockedCount, Integer luggageCount) {
+        if (luggageCount == null || luggageCount == 0) {
             return BigDecimal.ZERO;
         }
-        if (blockedCount == null)
-        {
+        if (blockedCount == null) {
             blockedCount = 0;
         }
         return BigDecimal.valueOf(blockedCount)
@@ -344,18 +309,15 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
 
     /**
      * 根据大队名称填充大队ID
-     * 
+     *
      * @param data 统计数据
      */
-    private void fillBrigadeIdByName(BlockedLuggagePieceDaily data)
-    {
-        if (ObjUtil.isNull(data.getBrigadeId()) && StrUtil.isNotBlank(data.getBrigadeName()))
-        {
+    private void fillBrigadeIdByName(BlockedLuggagePieceDaily data) {
+        if (ObjUtil.isNull(data.getBrigadeId()) && StrUtil.isNotBlank(data.getBrigadeName())) {
             SysDept deptQuery = new SysDept();
             deptQuery.setDeptName(data.getBrigadeName());
             List<SysDept> deptList = sysDeptService.selectDeptList(deptQuery);
-            if (CollUtil.isNotEmpty(deptList))
-            {
+            if (CollUtil.isNotEmpty(deptList)) {
                 data.setBrigadeId(deptList.get(0).getDeptId());
             }
         }

airport-blocked/src/main/resources/mapper/blocked/BlockedLuggagePieceDailyMapper.xml

@@ -1,61 +1,82 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sundot.airport.blocked.mapper.BlockedLuggagePieceDailyMapper">
-    
+
     <resultMap type="BlockedLuggagePieceDaily" id="BlockedLuggagePieceDailyResult">
-        <result property="id"    column="id"    />
-        <result property="statDate"    column="stat_date"    />
-        <result property="brigadeId"    column="brigade_id"    />
-        <result property="brigadeName"    column="brigade_name"    />
-        <result property="timePeriod"    column="time_period"    />
-        <result property="t1WalkBagCount"    column="t1_walk_bag_count"    />
-        <result property="t1WalkBlockedCount"    column="t1_walk_blocked_count"    />
-        <result property="t2WalkBagCount"    column="t2_walk_bag_count"    />
-        <result property="t2WalkBlockedCount"    column="t2_walk_blocked_count"    />
-        <result property="t1TravelBagCount"    column="t1_travel_bag_count"    />
-        <result property="t1TravelBlockedCount"    column="t1_travel_blocked_count"    />
-        <result property="t2TravelBagCount"    column="t2_travel_bag_count"    />
-        <result property="t2TravelBlockedCount"    column="t2_travel_blocked_count"    />
-        <result property="totalLuggageCount"    column="total_luggage_count"    />
-        <result property="totalBlockedCount"    column="total_blocked_count"    />
-        <result property="blockedRate"    column="blocked_rate"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="delFlag"    column="del_flag"    />
+        <result property="id" column="id"/>
+        <result property="statDate" column="stat_date"/>
+        <result property="brigadeId" column="brigade_id"/>
+        <result property="brigadeName" column="brigade_name"/>
+        <result property="timePeriod" column="time_period"/>
+        <result property="t1WalkBagCount" column="t1_walk_bag_count"/>
+        <result property="t1WalkBlockedCount" column="t1_walk_blocked_count"/>
+        <result property="t2WalkBagCount" column="t2_walk_bag_count"/>
+        <result property="t2WalkBlockedCount" column="t2_walk_blocked_count"/>
+        <result property="t1TravelBagCount" column="t1_travel_bag_count"/>
+        <result property="t1TravelBlockedCount" column="t1_travel_blocked_count"/>
+        <result property="t2TravelBagCount" column="t2_travel_bag_count"/>
+        <result property="t2TravelBlockedCount" column="t2_travel_blocked_count"/>
+        <result property="totalLuggageCount" column="total_luggage_count"/>
+        <result property="totalBlockedCount" column="total_blocked_count"/>
+        <result property="blockedRate" column="blocked_rate"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
     </resultMap>
 
     <sql id="selectBlockedLuggagePieceDailyVo">
-        select id, stat_date, brigade_id, brigade_name, time_period,
-               t1_walk_bag_count, t1_walk_blocked_count, t2_walk_bag_count, t2_walk_blocked_count,
-               t1_travel_bag_count, t1_travel_blocked_count, t2_travel_bag_count, t2_travel_blocked_count,
-               total_luggage_count, total_blocked_count, blocked_rate,
-               create_by, create_time, update_by, update_time, remark, del_flag
+        select id,
+               stat_date,
+               brigade_id,
+               brigade_name,
+               time_period,
+               t1_walk_bag_count,
+               t1_walk_blocked_count,
+               t2_walk_bag_count,
+               t2_walk_blocked_count,
+               t1_travel_bag_count,
+               t1_travel_blocked_count,
+               t2_travel_bag_count,
+               t2_travel_blocked_count,
+               total_luggage_count,
+               total_blocked_count,
+               blocked_rate,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark,
+               del_flag
         from blocked_luggage_piece_daily
     </sql>
 
-    <select id="selectBlockedLuggagePieceDailyList" parameterType="BlockedLuggagePieceDaily" resultMap="BlockedLuggagePieceDailyResult">
+    <select id="selectBlockedLuggagePieceDailyList" parameterType="BlockedLuggagePieceDaily"
+            resultMap="BlockedLuggagePieceDailyResult">
         <include refid="selectBlockedLuggagePieceDailyVo"/>
-        <where>  
+        <where>
             del_flag = '0'
-            <if test="statDate != null "> and stat_date = #{statDate}</if>
-            <if test="brigadeId != null "> and brigade_id = #{brigadeId}</if>
-            <if test="brigadeName != null  and brigadeName != ''"> and brigade_name like concat('%', #{brigadeName}, '%')</if>
-            <if test="timePeriod != null  and timePeriod != ''"> and time_period = #{timePeriod}</if>
+            <if test="statDate != null ">and stat_date = #{statDate}</if>
+            <if test="brigadeId != null ">and brigade_id = #{brigadeId}</if>
+            <if test="brigadeName != null  and brigadeName != ''">and brigade_name like concat('%', #{brigadeName},
+                '%')
+            </if>
+            <if test="timePeriod != null  and timePeriod != ''">and time_period = #{timePeriod}</if>
         </where>
         order by stat_date desc, time_period, brigade_id
     </select>
-    
+
     <select id="selectBlockedLuggagePieceDailyById" parameterType="Long" resultMap="BlockedLuggagePieceDailyResult">
         <include refid="selectBlockedLuggagePieceDailyVo"/>
         where id = #{id} and del_flag = '0'
     </select>
-        
-    <insert id="insertBlockedLuggagePieceDaily" parameterType="BlockedLuggagePieceDaily" useGeneratedKeys="true" keyProperty="id">
+
+    <insert id="insertBlockedLuggagePieceDaily" parameterType="BlockedLuggagePieceDaily" useGeneratedKeys="true"
+            keyProperty="id">
         insert into blocked_luggage_piece_daily
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="statDate != null">stat_date,</if>
@@ -79,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="statDate != null">#{statDate},</if>
             <if test="brigadeId != null">#{brigadeId},</if>
@@ -102,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateBlockedLuggagePieceDaily" parameterType="BlockedLuggagePieceDaily">
@@ -131,11 +152,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteBlockedLuggagePieceDailyById" parameterType="Long">
-        update blocked_luggage_piece_daily set del_flag = '2' where id = #{id}
+        update blocked_luggage_piece_daily
+        set del_flag = '2'
+        where id = #{id}
     </delete>
 
     <delete id="deleteBlockedLuggagePieceDailyByIds" parameterType="String">
-        update blocked_luggage_piece_daily set del_flag = '2' where id in 
+        update blocked_luggage_piece_daily set del_flag = '2' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>