Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-distributed-java

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

@@ -6,8 +6,11 @@ import com.zd.bottle.domain.AlarmRecord;
 import com.zd.bottle.domain.BottleStorage;
 import com.zd.bottle.domain.RfidTag;
 import com.zd.bottle.service.BottleStorageService;
+import com.zd.bottle.service.UseRecordService;
 import com.zd.bottle.vo.BottleStorageVo;
+import com.zd.bottle.vo.UseRecordVo;
 import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.web.domain.AjaxResult;
 import com.zd.bottle.vo.BottleStorageUseVo;
 import com.zd.bottle.vo.BottleStorageVo;
 import com.zd.common.core.utils.SecurityUtils;
@@ -24,7 +27,9 @@ import org.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -41,6 +46,9 @@ public class BottleStorageController extends BaseController {
     @Resource
     private BottleStorageService bottleStorageService;
 
+    @Resource
+    private UseRecordService useRecordService;
+
     /**
      * 查询入库记录列表
      */
@@ -76,8 +84,16 @@ public class BottleStorageController extends BaseController {
     @ApiOperation(value = "入库详情")
     @PreAuthorize(hasPermi = "bottle:bottleStorage:query")
     @GetMapping(value = "/{id}")
-    public ResultData<BottleStorage> getInfo(@PathVariable("id") Long id) {
-        return ResultData.success(bottleStorageService.getById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        Map<String,Object> map = new HashMap<String,Object>();
+        //查询使用记录
+        List<UseRecordVo> list = useRecordService.getListUseRecord(id);
+        map.put("list",list);
+
+        //查询入库详情
+        BottleStorage bottleStorage = bottleStorageService.getById(id);
+        map.put("bottleStorage",bottleStorage);
+        return AjaxResult.success(map);
     }
 
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/UseRecordMapper.java

@@ -40,4 +40,11 @@ public interface UseRecordMapper extends BaseMapper<UseRecord> {
      * @return 数据集合
      */
     List<AirAmount> calcAmount(@Param("airName") String airName);
+
+    /***
+     * 查询气瓶的使用记录
+     * @param storageId
+     * @return
+     */
+    List<UseRecordVo> getListUseRecord(Long storageId);
 }

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

@@ -31,7 +31,7 @@ public interface BottleStorageService extends IService<BottleStorage> {
     boolean add(BottleStorage bottleStorage);
 
     /***
-     *
+     *气瓶入库列表
      * @param vo
      * @return
      */

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

@@ -95,4 +95,11 @@ public interface UseRecordService extends IService<UseRecord> {
      * @return List
      */
     List<UseRecord> getByStorageId(Long storageId);
+
+    /***
+     * 查询气瓶的使用记录
+     * @param storageId
+     * @return
+     */
+    List<UseRecordVo> getListUseRecord(Long storageId);
 }

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

@@ -58,6 +58,8 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
     private BottleStorageErrorService errorService;
     @Resource
     private TokenService tokenService;
+    @Resource
+    private UseRecordMapper useRecordMapper;
 
     @Override
     public List<UseRecordVo> getListVo(List<UseRecord> records) {
@@ -122,6 +124,16 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
         return list(queryWrapper);
     }
 
+    /***
+     * 查询气瓶的使用记录
+     * @param storageId
+     * @return
+     */
+    @Override
+    public List<UseRecordVo> getListUseRecord(Long storageId) {
+        return useRecordMapper.getListUseRecord(storageId);
+    }
+
     @Override
     public List<AirAmount> calcRepertory(String airName) {
         return baseMapper.calcRepertory(airName);

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

@@ -4,6 +4,24 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.zd.bottle.domain.UseRecord">
+        <result column="id" property="id"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="contacts" property="contacts"/>
+        <result column="user_id" property="userId"/>
+        <result column="phone" property="phone"/>
+        <result column="location" property="location"/>
+        <result column="subject_id" property="subjectId"/>
+        <result column="storage_id" property="storageId"/>
+        <result column="before_use_pic" property="beforeUsePic"/>
+        <result column="before_use" property="beforeUse"/>
+        <result column="after_use_pic" property="afterUsePic"/>
+        <result column="after_use" property="afterUse"/>
+        <result column="amount" property="amount"/>
+        <result column="use_time" property="useTime"/>
+        <result column="back_time" property="backTime"/>
         <result column="id" property="id" />
         <result column="create_time" property="createTime" />
         <result column="create_by" property="createBy" />
@@ -41,7 +59,7 @@
                 FROM ab_use_record r
                 WHERE r.user_id = ur.user_id
                   AND r.storage_id = ur.storage_id
-                GROUP BY r.user_id) count_number,
+                GROUP BY r.user_id)    count_number,
                (SELECT SUM(r.amount)
                 FROM ab_use_record r
                 WHERE r.user_id = ur.user_id
@@ -90,4 +108,16 @@
         )
     </select>
 
+    <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
+        from ab_use_record ur
+        where 1=1
+        <if test="storage_id != null ">
+              and ur.storage_id = ${storageId}
+        </if>
+        GROUP BY ur.user_id, contacts, phone
+
+    </select>
+
 </mapper>