气瓶相关功能开发

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingDataUnitDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 气瓶充装总量统计表-企业
+ *
+ * @author system_generator
+ * @date 2022-03-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderFillingDataUnitDto", description="气瓶充装总量统计表-企业")
+public class CylinderFillingDataUnitDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "上月充装量")
+    private Double totalSum;
+
+    @ApiModelProperty(value = "充装量增减量")
+    private Double changeSum;
+
+    @ApiModelProperty(value = "增减环比")
+    private String changePercent;
+
+    @ApiModelProperty(value = "企业编码")
+    private String appId;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "充装年份")
+    private String fillingYear;
+
+    @ApiModelProperty(value = "充装月份")
+    private String fillingMonth;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderInfoDataUnitDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 气瓶总量统计表-企业
+ *
+ * @author system_generator
+ * @date 2022-03-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderInfoDataUnitDto", description="气瓶总量统计表-企业")
+public class CylinderInfoDataUnitDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "气瓶总量")
+    private Long totalSum;
+
+    @ApiModelProperty(value = "气瓶增减数量")
+    private Long changeSum;
+
+    @ApiModelProperty(value = "增减环比")
+    private String changePercent;
+
+    @ApiModelProperty(value = "企业编码")
+    private String appId;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderTagsDataUnitDto.java

@@ -22,7 +22,7 @@ public class CylinderTagsDataUnitDto  extends BaseDto {
 
 
     @ApiModelProperty(value = "气瓶标签比")
-    private Double percent;
+    private Double tagPercent;
 
     @ApiModelProperty(value = "气瓶数量")
     private Long cylinderSum;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingDataUnit.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 气瓶充装总量统计表-企业
+ *
+ * @author system_generator
+ * @date 2022-03-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_filling_data_unit")
+public class CylinderFillingDataUnit extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 上月充装量
+     */
+	@TableField("total_sum")
+    private Double totalSum;
+
+    /**
+     * 充装量增减量
+     */
+	@TableField("change_sum")
+    private Double changeSum;
+
+    /**
+     * 增减环比
+     */
+	@TableField("change_percent")
+    private String changePercent;
+
+    /**
+     * 企业编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 充装年份
+     */
+	@TableField("filling_year")
+    private String fillingYear;
+
+    /**
+     * 充装月份
+     */
+	@TableField("filling_month")
+    private String fillingMonth;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderInfoDataUnit.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 气瓶总量统计表-企业
+ *
+ * @author system_generator
+ * @date 2022-03-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_cylinder_info_data_unit")
+public class CylinderInfoDataUnit extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 气瓶总量
+     */
+	@TableField("total_sum")
+    private Long totalSum;
+
+    /**
+     * 气瓶增减数量
+     */
+	@TableField("change_sum")
+    private Long changeSum;
+
+    /**
+     * 增减环比
+     */
+	@TableField("change_percent")
+    private String changePercent;
+
+    /**
+     * 企业编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderTagsDataUnit.java

@@ -25,8 +25,8 @@ public class CylinderTagsDataUnit extends BaseEntity {
     /**
      * 气瓶标签比
      */
-	@TableField("percent")
-    private Double percent;
+	@TableField("tag_percent")
+    private Double tagPercent;
 
     /**
      * 气瓶数量

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderFillingCheckMapper.java

@@ -2,6 +2,9 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
 
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingCheck;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
 
 /**
  * 液化气体气瓶充装信息-充装后复查 Mapper 接口
@@ -12,4 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface CylinderFillingCheckMapper extends BaseMapper<CylinderFillingCheck> {
 
     Double queryIntegirtyByAppId(String appId);
+
+    Integer getFillingCountByMonth(@Param("appId") String appId, @Param("time") Date time);
+
+    Integer getFillingPassedCountByMonth(@Param("appId") String appId, @Param("time") Date time);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderFillingDataUnitMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingDataUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 气瓶充装总量统计表-企业 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-14
+ */
+public interface CylinderFillingDataUnitMapper extends BaseMapper<CylinderFillingDataUnit> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderFillingMapper.java

@@ -2,6 +2,9 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
 
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFilling;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
 
 /**
  * 气瓶充装信息--充装前检查 Mapper 接口
@@ -12,4 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface CylinderFillingMapper extends BaseMapper<CylinderFilling> {
 
     Double queryIntegirtyByAppId(String appId);
+
+    Integer getFillingCountByMonth(@Param("appId") String appId, @Param("time") Date time);
+
+    Integer getFillingPassedCountByMonth(@Param("appId") String appId, @Param("time") Date time);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderFillingRecordMapper.java

@@ -45,4 +45,9 @@ public interface CylinderFillingRecordMapper extends BaseMapper<CylinderFillingR
                                                              @Param("appId") String appId
                                                              );
 
+    Double getFillingSumByMonth(@Param("appId") String appId,@Param("time") Date time);
+
+    Integer getFillingCountByMonth(@Param("appId") String appId,@Param("time") Date time);
+
+    Double getFillingSumByDate(@Param("appId") String appId,@Param("time") Date time);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderInfoDataUnitMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfoDataUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 气瓶总量统计表-企业 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-03-14
+ */
+public interface CylinderInfoDataUnitMapper extends BaseMapper<CylinderInfoDataUnit> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderInfoMapper.java

@@ -44,4 +44,16 @@ public interface CylinderInfoMapper extends BaseMapper<CylinderInfo> {
     Double queryIntegirtyByAppId(@Param("appId")  String appId);
 
     Integer getWarnNum(String code);
+
+    /**
+     * 获取上个月气瓶总量-APPID
+     * @return
+     */
+    Integer getLastMonthInfoTotalUnit(@Param("appId") String appId);
+
+    /**
+     * 获取上上个月气瓶总量-APPID
+     * @return
+     */
+    Integer getMonthBeforeLastInfoTotalUnit(@Param("appId")String appId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderFillingDataUnitService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 气瓶充装总量统计表-企业接口类
+ *
+ * @author system_generator
+ * @date 2022-03-14
+ */
+public interface ICylinderFillingDataUnitService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderInfoDataUnitService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 气瓶总量统计表-企业接口类
+ *
+ * @author system_generator
+ * @date 2022-03-14
+ */
+public interface ICylinderInfoDataUnitService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderFillingCheckMapper.xml

@@ -6,4 +6,18 @@
         SELECT AVG(integrity) AS score_avg FROM tz_cylinder_filling_check t where t.app_id = #{appId} AND
          DATE_SUB(CURDATE(), INTERVAL 30 DAY) <![CDATA[ <= ]]> date(t.sync_date);
     </select>
+
+    <select id="getFillingCountByMonth" resultType="java.lang.Integer">
+        select count(1) from tz_cylinder_filling_check r where date_format(r.inspection_date,'%Y-%m') = date_format(#{time},'%Y-%m') and app_id = #{appId}
+    </select>
+
+    <select id="getFillingPassedCountByMonth" resultType="java.lang.Integer">
+        select
+        IFNULL(
+                sum(
+                case c.within_scope+c.sealed_state+c.defective+c.abnormal_temperature+c.warning_sign
+                    when 5 then 1
+                else
+                    0 end ), 0) from tz_cylinder_filling_check c where date_format(c.inspection_date,'%Y-%m') = date_format(#{time},'%Y-%m') and app_id = #{appId}
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderFillingDataUnitMapper.xml

+<?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">
+<mapper namespace="com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingDataUnitMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderFillingMapper.xml

@@ -6,4 +6,17 @@
         SELECT AVG(integrity) AS score_avg FROM tz_cylinder_filling t where t.app_id = #{appId} AND
          DATE_SUB(CURDATE(), INTERVAL 30 DAY) <![CDATA[ <= ]]> date(t.sync_date);
     </select>
+
+    <select id="getFillingCountByMonth" resultType="java.lang.Integer">
+        select count(1) from tz_cylinder_filling r where date_format(r.inspection_date,'%Y-%m') = date_format(#{time},'%Y-%m') and app_id = #{appId}
+    </select>
+    <select id="getFillingPassedCountByMonth" resultType="java.lang.Integer">
+        select
+        IFNULL(
+        sum(
+        case f.is_valid+f.same+f.is_regulations+f.is_complete+f.have_still_pressure+f.is_complete+f.have_security_documents
+        when 7 then 1
+         else
+        0 end ),0) from tz_cylinder_filling f where date_format(f.inspection_date,'%Y-%m') = date_format(#{time},'%Y-%m') and app_id = #{appId}
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderFillingRecordMapper.xml

@@ -119,4 +119,15 @@
         </if>
     </select>
 
+    <select id="getFillingSumByMonth" resultType="java.lang.Double">
+        select ifnull(sum(r.filling_quantity),0) from tz_cylinder_filling_record r where date_format(r.filling_endTime,'%Y-%m') = date_format(#{time},'%Y-%m') and app_id = #{appId}
+    </select>
+    <select id="getFillingSumByDate" resultType="java.lang.Double">
+        select ifnull(sum(r.filling_quantity),0) from tz_cylinder_filling_record r where date_format(r.filling_endTime,'%Y-%m-%d') = date_format(#{time},'%Y-%m-%d') and app_id = #{appId}
+    </select>
+
+    <select id="getFillingCountByMonth" resultType="java.lang.Integer">
+        select count(1) from tz_cylinder_filling_record r where date_format(r.filling_endTime,'%Y-%m') = date_format(#{time},'%Y-%m') and app_id = #{appId}
+    </select>
+
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderInfoDataUnitMapper.xml

+<?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">
+<mapper namespace="com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderInfoDataUnitMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -49,4 +49,13 @@
         )
     </select>
 
+    <select id="getLastMonthInfoTotalUnit" resultType="java.lang.Integer">
+        select IFNULL(count(sequence_nbr), 0) from tz_cylinder_info where PERIOD_DIFF( date_format( now( ) , '%Y%m' ) , date_format( sync_date, '%Y%m' ) ) =1 AND app_id = #{appId}
+    </select>
+
+    <select id="getMonthBeforeLastInfoTotalUnit" resultType="java.lang.Integer">
+        select IFNULL(count(sequence_nbr), 0) from tz_cylinder_info where PERIOD_DIFF( date_format( now( ) , '%Y%m' ) , date_format( sync_date, '%Y%m' ) ) =2 AND app_id = #{appId}
+    </select>
+
+
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderFillingDataUnitController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderFillingDataUnitServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingDataUnitDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 气瓶充装总量统计表-企业
+ *
+ * @author system_generator
+ * @date 2022-03-14
+ */
+@RestController
+@Api(tags = "气瓶充装总量统计表-企业Api")
+@RequestMapping(value = "/cylinder-filling-data-unit")
+public class CylinderFillingDataUnitController extends BaseController {
+
+    @Autowired
+    CylinderFillingDataUnitServiceImpl cylinderFillingDataUnitServiceImpl;
+
+    /**
+     * 新增气瓶充装总量统计表-企业
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增气瓶充装总量统计表-企业", notes = "新增气瓶充装总量统计表-企业")
+	public ResponseModel<CylinderFillingDataUnitDto> save(@RequestBody CylinderFillingDataUnitDto model) {
+	    model = cylinderFillingDataUnitServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新气瓶充装总量统计表-企业", notes = "根据sequenceNbr更新气瓶充装总量统计表-企业")
+	public ResponseModel<CylinderFillingDataUnitDto> updateBySequenceNbrCylinderFillingDataUnit(@RequestBody CylinderFillingDataUnitDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(cylinderFillingDataUnitServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除气瓶充装总量统计表-企业", notes = "根据sequenceNbr删除气瓶充装总量统计表-企业")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(cylinderFillingDataUnitServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶充装总量统计表-企业",  notes = "根据sequenceNbr查询单个气瓶充装总量统计表-企业")
+	public ResponseModel<CylinderFillingDataUnitDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(cylinderFillingDataUnitServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "气瓶充装总量统计表-企业分页查询",  notes = "气瓶充装总量统计表-企业分页查询")
+	public ResponseModel<Page<CylinderFillingDataUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderFillingDataUnitDto> page = new Page<CylinderFillingDataUnitDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderFillingDataUnitServiceImpl.queryForCylinderFillingDataUnitPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "气瓶充装总量统计表-企业列表全部数据查询",   notes = "气瓶充装总量统计表-企业列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<CylinderFillingDataUnitDto>> selectForList() {
+	    return ResponseHelper.buildResponse(cylinderFillingDataUnitServiceImpl.queryForCylinderFillingDataUnitList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderInfoController.java

@@ -677,4 +677,87 @@ public class CylinderInfoController extends BaseController {
 	}
 
 
+
+	/**
+	 * 企业气瓶总量数据同步
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/synUnitCylinderInfoData")
+	@ApiOperation(httpMethod = "GET", value = "企业气瓶总量数据同步", notes = "企业气瓶总量数据同步")
+	public ResponseModel<Boolean> synUnitCylinderInfoData() {
+		Boolean flag = cylinderInfoServiceImpl.synUnitCylinderInfoData();
+
+		return ResponseHelper.buildResponse(flag);
+	}
+
+    /**
+     * 企业气瓶充装数据同步
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/synUnitCylinderFillingData")
+    @ApiOperation(httpMethod = "GET", value = "企业气瓶充装数据同步", notes = "企业气瓶充装数据同步")
+    public ResponseModel<Boolean> synUnitCylinderFillingData() {
+        Boolean flag = cylinderInfoServiceImpl.synUnitCylinderFillingData();
+
+        return ResponseHelper.buildResponse(flag);
+    }
+
+    /**
+     * 企业气瓶标签数量比同步
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/synUnitCylinderTagsData")
+    @ApiOperation(httpMethod = "GET", value = "企业气瓶标签数量比同步", notes = "企业气瓶标签数量比同步")
+    public ResponseModel<Boolean> synUnitCylinderTagsData() {
+        Boolean flag = cylinderInfoServiceImpl.synUnitCylinderTagsData();
+        return ResponseHelper.buildResponse(flag);
+    }
+
+	/**
+	 * 企业数据完整度同步
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/synUnitIntegrityData")
+	@ApiOperation(httpMethod = "GET", value = "企业数据完整度同步", notes = "企业数据完整度同步")
+	public ResponseModel<Boolean> synUnitIntegrityData() {
+		Boolean flag = cylinderInfoServiceImpl.synUnitIntegrityData();
+		return ResponseHelper.buildResponse(flag);
+	}
+
+    /**
+     * 气瓶充装检查情况同步
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/synUnitFillingCheckData")
+    @ApiOperation(httpMethod = "GET", value = "气瓶充装检查情况同步", notes = "气瓶充装检查情况同步")
+    public ResponseModel<Boolean> synUnitFillingCheckData() {
+        Boolean flag = cylinderInfoServiceImpl.synUnitFillingCheckData();
+        return ResponseHelper.buildResponse(flag);
+    }
+
+	/**
+	 * 装卸液体企业数据同步
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/synFillingUnloadUnitData")
+	@ApiOperation(httpMethod = "GET", value = "装卸液体企业数据同步", notes = "装卸液体企业数据同步")
+	public ResponseModel<Boolean> synFillingUnloadUnitData() {
+		Boolean flag = cylinderInfoServiceImpl.synFillingUnloadUnitData();
+
+		return ResponseHelper.buildResponse(flag);
+	}
+
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderInfoDataUnitController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderInfoDataUnitServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInfoDataUnitDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 气瓶总量统计表-企业
+ *
+ * @author system_generator
+ * @date 2022-03-14
+ */
+@RestController
+@Api(tags = "气瓶总量统计表-企业Api")
+@RequestMapping(value = "/cylinder-info-data-unit")
+public class CylinderInfoDataUnitController extends BaseController {
+
+    @Autowired
+    CylinderInfoDataUnitServiceImpl cylinderInfoDataUnitServiceImpl;
+
+    /**
+     * 新增气瓶总量统计表-企业
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增气瓶总量统计表-企业", notes = "新增气瓶总量统计表-企业")
+	public ResponseModel<CylinderInfoDataUnitDto> save(@RequestBody CylinderInfoDataUnitDto model) {
+	    model = cylinderInfoDataUnitServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新气瓶总量统计表-企业", notes = "根据sequenceNbr更新气瓶总量统计表-企业")
+	public ResponseModel<CylinderInfoDataUnitDto> updateBySequenceNbrCylinderInfoDataUnit(@RequestBody CylinderInfoDataUnitDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(cylinderInfoDataUnitServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除气瓶总量统计表-企业", notes = "根据sequenceNbr删除气瓶总量统计表-企业")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(cylinderInfoDataUnitServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶总量统计表-企业",  notes = "根据sequenceNbr查询单个气瓶总量统计表-企业")
+	public ResponseModel<CylinderInfoDataUnitDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(cylinderInfoDataUnitServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "气瓶总量统计表-企业分页查询",  notes = "气瓶总量统计表-企业分页查询")
+	public ResponseModel<Page<CylinderInfoDataUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderInfoDataUnitDto> page = new Page<CylinderInfoDataUnitDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderInfoDataUnitServiceImpl.queryForCylinderInfoDataUnitPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "气瓶总量统计表-企业列表全部数据查询",   notes = "气瓶总量统计表-企业列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<CylinderInfoDataUnitDto>> selectForList() {
+	    return ResponseHelper.buildResponse(cylinderInfoDataUnitServiceImpl.queryForCylinderInfoDataUnitList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderFillingCheckServiceImpl.java

@@ -7,6 +7,8 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingCheckDto;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -34,4 +36,12 @@ public class CylinderFillingCheckServiceImpl extends BaseService<CylinderFilling
     public Double queryIntegirtyByAppId(String appId) {
         return this.baseMapper.queryIntegirtyByAppId(appId);
     }
+
+    public Integer getFillingCountByMonth(String appId, Date time) {
+        return this.baseMapper.getFillingCountByMonth(appId,time);
+    }
+
+    public Integer getFillingPassedCountByMonth(String appId, Date time) {
+        return this.baseMapper.getFillingPassedCountByMonth(appId,time);
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderFillingDataUnitServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingDataUnit;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingDataUnitMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderFillingDataUnitService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingDataUnitDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 气瓶充装总量统计表-企业服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-14
+ */
+@Service
+public class CylinderFillingDataUnitServiceImpl extends BaseService<CylinderFillingDataUnitDto,CylinderFillingDataUnit,CylinderFillingDataUnitMapper> implements ICylinderFillingDataUnitService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderFillingDataUnitDto> queryForCylinderFillingDataUnitPage(Page<CylinderFillingDataUnitDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderFillingDataUnitDto> queryForCylinderFillingDataUnitList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java

@@ -55,4 +55,16 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
         page1.setRecords(resultDtoList);
         return  page1;
     }
+
+    public Double getFillingSumByMonth(String appId, Date time) {
+        return baseMapper.getFillingSumByMonth(appId,time);
+    }
+
+    public Integer getFillingCountByMonth(String appId, Date time) {
+        return baseMapper.getFillingCountByMonth(appId,time);
+    }
+
+    public Double getFillingSumByDate(String appId, Date time) {
+        return baseMapper.getFillingSumByDate(appId,time);
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderFillingServiceImpl.java

@@ -7,6 +7,8 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingDto;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -34,4 +36,12 @@ public class CylinderFillingServiceImpl extends BaseService<CylinderFillingDto,C
     public Double queryIntegirtyByAppId(String appId) {
         return this.baseMapper.queryIntegirtyByAppId(appId);
     }
+
+    public Integer getFillingCountByMonth(String appId, Date time) {
+        return this.baseMapper.getFillingCountByMonth(appId,time);
+    }
+
+    public Integer getFillingPassedCountByMonth(String appId, Date time) {
+        return this.baseMapper.getFillingPassedCountByMonth(appId,time);
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderInfoDataUnitServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfoDataUnit;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderInfoDataUnitMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderInfoDataUnitService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInfoDataUnitDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 气瓶总量统计表-企业服务实现类
+ *
+ * @author system_generator
+ * @date 2022-03-14
+ */
+@Service
+public class CylinderInfoDataUnitServiceImpl extends BaseService<CylinderInfoDataUnitDto,CylinderInfoDataUnit,CylinderInfoDataUnitMapper> implements ICylinderInfoDataUnitService {
+    /**
+     * 分页查询
+     */
+    public Page<CylinderInfoDataUnitDto> queryForCylinderInfoDataUnitPage(Page<CylinderInfoDataUnitDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<CylinderInfoDataUnitDto> queryForCylinderInfoDataUnitList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file