linft hace 2 años
padre
commit
274f4cef3e

+ 0 - 2
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/config/InjectFilter.java

@@ -20,8 +20,6 @@ import java.util.regex.Pattern;
 public class InjectFilter implements Filter {
     private static Logger log = LoggerFactory.getLogger(InjectFilter.class);
     private static final String REG_EXP = "\\.\\./";
-    @Override
-    public void init(FilterConfig filterConfig) {}
 
     public void doFilter(ServletRequest request, ServletResponse response,
                          FilterChain filterchain) throws IOException, ServletException {

+ 2 - 2
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpBottleStorageManageController.java

@@ -63,7 +63,7 @@ public class QpBottleStorageManageController extends BaseController
     {
         startPage();
         List<QpBottleStorageVO> list = qpBottleStorageService.selectQpBottleStorageList(qpBottleStorage);
-        if(list.size()>0){
+        if(!list.isEmpty()){
             for (int i=0;i<list.size();i++){
                 QpTaskDetailVO detailVO = qpTaskDetailService.selectRelationByDetailsId(list.get(i).getTaskDetailId());
                 if(detailVO!=null){
@@ -97,7 +97,7 @@ public class QpBottleStorageManageController extends BaseController
         List<QpBottleStorageExcelVo> listVo = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<QpBottleStorageVO> list = qpBottleStorageService.selectQpBottleStorageList(qpBottleStorage);
-        if(list.size()>0){
+        if(!list.isEmpty()){
             for (int i=0;i<list.size();i++){
                 QpTaskDetailVO detailVO = qpTaskDetailService.selectRelationByDetailsId(list.get(i).getTaskDetailId());
                 list.get(i).setQpTaskDetailVO(detailVO);

+ 2 - 2
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpBottleStorageOutManageController.java

@@ -105,10 +105,10 @@ public class QpBottleStorageOutManageController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response,QpBottleStorageOutVO qpBottleStorageOut) throws IOException
     {
-        List<QpBottleStorageOutExcelVo> listexcel = new ArrayList<QpBottleStorageOutExcelVo>();
+        List<QpBottleStorageOutExcelVo> listexcel = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<QpBottleStorageOutVO> list = qpBottleStorageOutService.selectQpBottleStorageOutList(qpBottleStorageOut);
-        if(list.size()>0){
+        if(!list.isEmpty()){
             for (int i=0;i<list.size();i++){
                 QpBottleStorageOutExcelVo  excelOut = new QpBottleStorageOutExcelVo();
                 //入库详情

+ 0 - 10
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/bo/DbStockBo.java

@@ -1,24 +1,14 @@
 package com.zd.airbottle.domain.bo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.zd.airbottle.utils.PageUtil;
-import com.zd.model.page.PageDomain;
 import com.zd.model.page.PageQuery;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.poi.hpsf.Decimal;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 /**
  * @Description 东北大学库存业务类

+ 0 - 6
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/bo/DbUsageRecordBo.java

@@ -1,9 +1,5 @@
 package com.zd.airbottle.domain.bo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -11,8 +7,6 @@ import com.zd.model.page.PageQuery;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.poi.hpsf.Decimal;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;

+ 0 - 6
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/DbInOutRecordVo.java

@@ -1,15 +1,9 @@
 package com.zd.airbottle.domain.vo;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.poi.hpsf.Decimal;
-
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;

+ 1 - 4
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/DbStockVo.java

@@ -1,7 +1,6 @@
 package com.zd.airbottle.domain.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -9,8 +8,6 @@ import com.zd.airbottle.domain.DbUsageRecord;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.poi.hpsf.Decimal;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

+ 1 - 12
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/AlarmRecordServiceImpl.java

@@ -19,7 +19,6 @@ import com.zd.algorithm.api.alarm.entity.Routes;
 import com.zd.algorithm.api.alarm.entity.SendTypes;
 import com.zd.algorithm.api.alarm.feign.RemoteAlarmService;
 import com.zd.algorithm.api.camera.feign.RemoteCameraService;
-import com.zd.algorithm.api.rfid.domain.entity.HardwareRfid;
 import com.zd.algorithm.api.rfid.feign.RemoteRfidService;
 import com.zd.base.api.feign.RemoteMessageService;
 import com.zd.common.core.redis.RedisService;
@@ -48,7 +47,6 @@ import com.zd.system.api.feign.RemoteUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -100,18 +98,9 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
     private IQpAirBottleService qpAirBottleService;
 
     @Autowired
-    private IQpQualificationApplyService qualificationApplyService;
-
-    @Autowired
     private IQpUsegasApplyService qpUsegasApplyService;
 
     @Autowired
-    private RemoteMessageService remoteMessageService;
-
-    @Resource
-    private RedisTemplate<String, HardwareRfid> redisTemplate;
-
-    @Autowired
     private DbStockService dbStockService;
 
     private static final String RFID_CODE = "RFID:";
@@ -587,7 +576,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
      * @Param []
      * @Return void
      **/
-//    @Scheduled(cron = "0 0 0 * * ?")
+    @Override
     public void qpTimeOut() {
         log.info("气瓶超时定时任务!");
         // 查询配置