代码清理

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/AlarmRecordVo.java

@@ -33,9 +33,11 @@ public class AlarmRecordVo {
     @ApiModelProperty(value = "数据主键，关联其他业务表中的数据id")
     private Long masterId;
 
+    @Excel(name = "标签码" )
     @ApiModelProperty("电子标签")
     private String electronicTag;
 
+    @Excel(name = "气瓶编号" )
     @ApiModelProperty("气瓶编号")
     private String airNumber;
     /**
@@ -47,7 +49,7 @@ public class AlarmRecordVo {
     /**
      * 气瓶规格
      */
-    @Excel(name = "气瓶级别/规格" )
+    @Excel(name = "气瓶规格" )
     @ApiModelProperty(value = "气瓶规格")
     private String configName;
 

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/BottleStorageErrorVo.java

@@ -48,6 +48,14 @@ public class BottleStorageErrorVo {
     @ApiModelProperty("实验室名称")
     private String subjectName;
 
+    @Excel(name = "标签码" )
+    @ApiModelProperty("电子标签")
+    private String electronicTag;
+
+    @Excel(name = "气瓶编号" )
+    @ApiModelProperty("气瓶编号")
+    private String airNumber;
+
     /**
      * 气瓶入库ID
      */
@@ -56,7 +64,7 @@ public class BottleStorageErrorVo {
     @Excel(name = "气体名称")
     @ApiModelProperty(value = "气体名称")
     private String airName;
-    @Excel(name = "气体级别/规格")
+    @Excel(name = "气体规格")
     @ApiModelProperty(value = "气瓶规格")
     private String configName;
     /**
@@ -92,8 +100,6 @@ public class BottleStorageErrorVo {
     /** 气体组成（冗余字段） */
     @ApiModelProperty(value = "气体组成")
     private String airConstituents;
-    @ApiModelProperty(value = "气瓶编号")
-    private String airNumber;
 
     private List<UseRecordVo> recordVos;
 

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/UseRecordVo.java

@@ -41,12 +41,16 @@ public class UseRecordVo {
     @Excel(name = "联系方式")
     @ApiModelProperty(value = "联系方式")
     private String phone;
-    /**
-     * 实验地点
-     */
-    @Excel(name = "实验地点")
-    @ApiModelProperty(value = "实验地点")
-    private String location;
+
+
+    @Excel(name = "标签码" )
+    @ApiModelProperty("电子标签")
+    private String electronicTag;
+
+    @Excel(name = "气瓶编号" )
+    @ApiModelProperty("气瓶编号")
+    private String airNumber;
+
     /**
      * 气瓶入库ID
      */

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/BottleStorageController.java

@@ -16,6 +16,7 @@ import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
@@ -34,6 +35,7 @@ import java.util.Map;
  * @since 2022-09-08
  */
 @RestController
+@Api(tags = "【入库】")
 @RequestMapping("/bottleStorage")
 public class BottleStorageController extends BaseController {
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/BottleStorageErrorController.java

@@ -5,16 +5,16 @@ import com.zd.bottle.service.BottleStorageErrorService;
 import com.zd.bottle.vo.BottleStorageErrorVo;
 import com.zd.common.core.utils.bean.TransferUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.zd.common.core.web.controller.BaseController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -30,6 +30,7 @@ import java.util.List;
  * @since 2022-09-08
  */
 @RestController
+@Api(tags = "【异常记录】")
 @RequestMapping("/bottleStorageError")
 public class BottleStorageErrorController extends BaseController<BottleStorageError> {
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/BottleStorageOutController.java

@@ -10,6 +10,7 @@ import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
@@ -26,6 +27,7 @@ import java.util.List;
  * @since 2022-09-08
  */
 @RestController
+@Api(tags = "【出库记录】")
 @RequestMapping("/bottleStorageOut")
 public class BottleStorageOutController extends BaseController<BottleStorageOut> {
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/UseRecordController.java

@@ -17,11 +17,9 @@ import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.domain.SysUser;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -41,17 +39,16 @@ import java.util.List;
  * @since 2022-09-08
  */
 @RestController
+@Api(tags = "【使用记录表】")
 @RequestMapping("/useRecord")
 public class UseRecordController extends BaseController<UseRecord> {
-    SimpleDateFormat sdf = new SimpleDateFormat("MM-dd HH:mm");
-
     @Resource
     private UseRecordService useRecordService;
 
     /**
      * 查询使用记录列表
      */
-    @PreAuthorize(hasPermi = "bottle:use:record:list")
+//    @PreAuthorize(hasPermi = "bottle:use:record:list")
     @GetMapping("/list")
     @ApiOperation(value = "查询使用记录列表")
     public TableDataInfo<UseRecordVo> list(UseRecord useRecord) {

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/UsegasApplyController.java

@@ -6,16 +6,16 @@ import com.zd.bottle.vo.UsegasApplyTabVo;
 import com.zd.bottle.vo.UsegasApplyVo;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.web.domain.BaseBean;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.core.web.controller.BaseController;
 
 import java.util.List;
 
@@ -28,6 +28,7 @@ import java.util.List;
  * @since 2022-09-08
  */
 @RestController
+@Api(tags = "【用气申请表】")
 @RequestMapping("/usegasApply")
 public class UsegasApplyController extends BaseController<UsegasApply> {
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/UsegasAuditRecordController.java

@@ -9,6 +9,7 @@ import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +27,7 @@ import java.util.List;
  * @since 2022-09-08
  */
 @RestController
+@Api(tags = "【用气审核表】")
 @RequestMapping("/usegasAuditRecord")
 public class UsegasAuditRecordController extends BaseController<UsegasAuditRecord> {
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/AlarmRecordServiceImpl.java

@@ -87,7 +87,8 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
                 BottleStorage storage = storageMap.get(masterId);
                 r.setCurrentPressure(storage.getCurrentPressure())
                         .setAirName(storage.getAirName())
-                        .setConfigName(storage.getConfigName());
+                        .setConfigName(storage.getConfigName())
+                        .setAirNumber(storage.getAirNumber());
             }
         });
     }
@@ -95,7 +96,6 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
     @Override
     public List<AlarmRecord> getList(AlarmRecord alarmRecord) {
         LambdaQueryWrapper<AlarmRecord> queryWrapper = Wrappers.lambdaQuery(AlarmRecord.class);
-        queryWrapper.between(AlarmRecord::getAlarmTime,alarmRecord.getStartTime(),alarmRecord.getEndTime());
         String startTime = alarmRecord.getStartTime();
         if (StringUtils.hasLength(startTime)){
             queryWrapper.apply("DATE_FORMAT(alarm_time,'%Y-%m-%d') >="+alarmRecord.getStartTime());

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageErrorServiceImpl.java

@@ -37,16 +37,17 @@ public class BottleStorageErrorServiceImpl extends ServiceImpl<BottleStorageErro
     private BottleStorageService storageService;
     @Resource
     private UseRecordService useRecordService;
+
     @Override
     public List<BottleStorageError> list(BottleStorageError bottleStorageError) {
         LambdaQueryWrapper<BottleStorageError> queryWrapper = Wrappers.lambdaQuery(BottleStorageError.class);
         String startTime = bottleStorageError.getStartTime();
-        if (StringUtils.hasLength(startTime)){
-            queryWrapper.apply("DATE_FORMAT(op_time,'%Y-%m-%d') >="+startTime);
+        if (StringUtils.hasLength(startTime)) {
+            queryWrapper.apply("DATE_FORMAT(op_time,'%Y-%m-%d') >=" + startTime);
         }
         String endTime = bottleStorageError.getEndTime();
-        if (StringUtils.hasLength(endTime)){
-            queryWrapper.apply("DATE_FORMAT(op_time,'%Y-%m-%d') <="+endTime);
+        if (StringUtils.hasLength(endTime)) {
+            queryWrapper.apply("DATE_FORMAT(op_time,'%Y-%m-%d') <=" + endTime);
         }
         String searchValue = bottleStorageError.getSearchValue();
         if (StringUtils.hasLength(searchValue)) {
@@ -60,12 +61,14 @@ public class BottleStorageErrorServiceImpl extends ServiceImpl<BottleStorageErro
     @Override
     public void getBottleInfo(List<BottleStorageErrorVo> storageErrorVos) {
         Map<Long, BottleStorage> storageMap = getStorageMap(storageErrorVos);
-        storageErrorVos.forEach(se->{
+        storageErrorVos.forEach(se -> {
             Long storageId = se.getStorageId();
-            if (storageMap.containsKey(storageId)){
+            if (storageMap.containsKey(storageId)) {
                 BottleStorage storage = storageMap.get(storageId);
                 se.setAirName(storage.getAirName())
-                        .setConfigName(storage.getConfigName());
+                        .setConfigName(storage.getConfigName())
+                        .setElectronicTag(storage.getElectronicTag())
+                        .setAirNumber(storage.getAirNumber());
             }
         });
     }
@@ -73,13 +76,14 @@ public class BottleStorageErrorServiceImpl extends ServiceImpl<BottleStorageErro
     @Override
     public BottleStorageErrorVo getStorageErrorInfo(Long id) {
         BottleStorageError storageError = getById(id);
-        BottleStorageErrorVo storageErrorVo=new BottleStorageErrorVo();
-        BeanUtils.copyProperties(storageError,storageErrorVo);
+        BottleStorageErrorVo storageErrorVo = new BottleStorageErrorVo();
+        BeanUtils.copyProperties(storageError, storageErrorVo);
         BottleStorage bottleStorage = storageService.getById(storageError.getStorageId());
         storageErrorVo.setAirName(bottleStorage.getAirName())
                 .setConfigName(bottleStorage.getConfigName())
                 .setAirConstituents(bottleStorage.getAirComponent())
-                .setAirNumber(bottleStorage.getAirNumber());
+                .setAirNumber(bottleStorage.getAirNumber())
+                .setElectronicTag(bottleStorage.getElectronicTag());
         List<UseRecord> useRecords = useRecordService.getByStorageId(storageError.getStorageId());
         List<UseRecordVo> recordVos = TransferUtils.transferList(useRecords, UseRecordVo.class);
         storageErrorVo.setRecordVos(recordVos);

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UseRecordServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.bottle.domain.BottleStorage;
 import com.zd.bottle.domain.BottleStorageError;
 import com.zd.bottle.domain.UseRecord;
@@ -13,7 +14,6 @@ import com.zd.bottle.mapper.UseRecordMapper;
 import com.zd.bottle.service.BottleStorageErrorService;
 import com.zd.bottle.service.BottleStorageService;
 import com.zd.bottle.service.UseRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.bottle.service.UsegasApplyService;
 import com.zd.bottle.vo.AirAmount;
 import com.zd.bottle.vo.UseRecordVo;
@@ -22,11 +22,9 @@ import com.zd.common.core.constant.HttpStatus;
 import com.zd.common.core.constant.SecurityConstants;
 import com.zd.common.core.domain.R;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.bean.TransferUtils;
 import com.zd.common.security.service.TokenService;
-import com.zd.common.security.utils.SaveUtil;
 import com.zd.system.api.RemoteUserService;
 import com.zd.system.api.model.LoginUser;
 import org.springframework.beans.BeanUtils;
@@ -71,7 +69,9 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
             Long storageId = u.getStorageId();
             if (storageMap.containsKey(storageId)) {
                 BottleStorage bottleStorage = storageMap.get(storageId);
-                u.setAirName(bottleStorage.getAirName()).setStorage(bottleStorage);
+                u.setAirName(bottleStorage.getAirName())
+                        .setElectronicTag(bottleStorage.getElectronicTag()).setAirNumber(bottleStorage.getAirNumber())
+                        .setStorage(bottleStorage);
             }
         });
         return recordVos;
@@ -159,8 +159,8 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
                 .ge(UsegasApply::getEndTime, new Date())
                 //todo 气体ID待确认
                 .eq(UsegasApply::getUseGasName, recordDto.getBottleName())
-                .eq(UsegasApply::getLeadAuditStaus,1);
-        List <UsegasApply> list = usegasApplyService.list(queryWrapper);
+                .eq(UsegasApply::getLeadAuditStaus, 1);
+        List<UsegasApply> list = usegasApplyService.list(queryWrapper);
         if (list.isEmpty()) {
             result = 3;
         }
@@ -186,7 +186,7 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
         }
 
         LambdaUpdateWrapper<BottleStorage> updateWrapper = Wrappers.lambdaUpdate(BottleStorage.class);
-        updateWrapper.eq(BottleStorage::getId, useRecord.getStorageId()).set(BottleStorage::getStorageStatus,2);
+        updateWrapper.eq(BottleStorage::getId, useRecord.getStorageId()).set(BottleStorage::getStorageStatus, 2);
         Integer isSurplus = recordDto.getIsSurplus();
         if (isSurplus == 1) {
             // 修改库存中气瓶余量标记
@@ -213,9 +213,9 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
     public Integer updateUseRecord(UseRecord useRecord) {
         Long storageId = useRecord.getStorageId();
         LambdaQueryWrapper<UseRecord> queryWrapper = Wrappers.lambdaQuery(UseRecord.class);
-        queryWrapper.eq(UseRecord::getStorageId,storageId).isNull(UseRecord::getBackTime);
+        queryWrapper.eq(UseRecord::getStorageId, storageId).isNull(UseRecord::getBackTime);
         UseRecord temp = getOne(queryWrapper);
-        if (temp==null) {
+        if (temp == null) {
             throw new ServiceException("数据异常");
         }
         BigDecimal afterUse = useRecord.getAfterUse();
@@ -243,7 +243,7 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
     public List<UseRecord> getByUserId(UseRecord useRecord) {
         Long userId = tokenService.getLoginUser().getSysUser().getUserId();
         LambdaQueryWrapper<UseRecord> queryWrapper = Wrappers.lambdaQuery(UseRecord.class);
-        queryWrapper.eq(UseRecord::getUserId,userId);
+        queryWrapper.eq(UseRecord::getUserId, userId);
         return list(queryWrapper);
     }
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/UseRecordMapper.xml

@@ -12,7 +12,7 @@
         <result column="contacts" property="contacts"/>
         <result column="user_id" property="userId"/>
         <result column="phone" property="phone"/>
-        <result column="location" property="location"/>
+        <result column="subject_name" property="subjectName"/>
         <result column="subject_id" property="subjectId"/>
         <result column="storage_id" property="storageId"/>
         <result column="before_use_pic" property="beforeUsePic"/>
@@ -82,10 +82,10 @@
         ab_bottle_storage s
         LEFT JOIN ab_bottle_storage_out o ON s.id = o.storage_id
         WHERE
-        s.air_status=0 AND DATE_FORMAT( s.create_time, '%Y-%m' )> DATE_FORMAT( date_sub( curdate(), INTERVAL 12 MONTH ),
+         DATE_FORMAT( s.create_time, '%Y-%m' )> DATE_FORMAT( date_sub( curdate(), INTERVAL 12 MONTH ),
         '%Y-%m' )
         <if test="airName != null and airName!=''">
-            and s.air_bottle_name=#{airName}
+            and s.air_name=#{airName}
         </if>
         GROUP BY
         MONTH (s.create_time
@@ -101,7 +101,7 @@
         WHERE
         DATE_FORMAT( r.create_time, '%Y-%m' )> DATE_FORMAT( date_sub( curdate(), INTERVAL 12 MONTH ), '%Y-%m' )
         <if test="airName != null and airName!=''">
-            and s.specification_name LIKE concat( '%', #{airName}, '%' ) )
+            and s.config_name LIKE concat( '%', #{airName}, '%' ) )
         </if>
         GROUP BY
         MONTH (r.create_time
@@ -110,12 +110,13 @@
 
     <select id="getListUseRecord" resultType="com.zd.bottle.vo.UseRecordVo"
             parameterType="java.lang.Long">
-        select ur.user_id, contacts, phone, count(1) countNumber, sum(amount) amount, MAX(ur.use_time) use_time
+        select ur.user_id, contacts, phone, count(1) countNumber, sum(amount) as amount, MAX(ur.use_time) as use_time
         from ab_use_record ur
-        where 1=1
-        <if test="storage_id != null ">
-              and ur.storage_id = ${storageId}
-        </if>
+        <where>
+            <if test="storage_id != null ">
+                ur.storage_id = ${storageId}
+            </if>
+        </where>
         GROUP BY ur.user_id, contacts, phone
 
     </select>