修改气瓶系统bug

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java

@@ -125,8 +125,8 @@ public class MetaHandler implements MetaObjectHandler {
      */
     @Override
     public void updateFill(MetaObject metaObject) {
-        Class clazz = metaObject.getOriginalObject().getClass();
-        FillCommonUserField annotation = (FillCommonUserField) clazz.getAnnotation(FillCommonUserField.class);
+        Class<?> clazz = metaObject.getOriginalObject().getClass();
+        FillCommonUserField annotation = clazz.getAnnotation(FillCommonUserField.class);
         if (annotation == null || annotation.isAutoFill()) {
             String userId = RequestContext.getExeUserId();
             ReginParams reginParams =

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MyBatisPlusConfig.java

 package com.yeejoin.amos.boot.biz.config;
 
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
-import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -30,18 +32,16 @@ public class MyBatisPlusConfig {
     public Sequence sequence() {
         return new Sequence();
     }
+
     /**
      * plus分页插件支持
      */
-//    @Bean
-//    public PaginationInterceptor paginationInterceptor() {
-//        PaginationInterceptor page = new PaginationInterceptor();
-//        //设置方言类型
-//        page.setDialectType("mysql");
-//        //不限制
-//        page.setLimit(-1);
-//        return page;
-//    }
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
+        mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return mybatisPlusInterceptor;
+    }
 
     /**
      * pageHelper插件支持
@@ -50,15 +50,10 @@ public class MyBatisPlusConfig {
      */
     @Bean
     ConfigurationCustomizer mybatisConfigurationCustomizer() {
-        return new ConfigurationCustomizer() {
-            @Override
-            public void customize(MybatisConfiguration configuration) {
-                configuration.addInterceptor(new com.github.pagehelper.PageInterceptor());
-            }
-        };
+        return configuration -> configuration.addInterceptor(new com.github.pagehelper.PageInterceptor());
     }
 
-    @ConditionalOnProperty(name = "mybatis.interceptor.enabled",havingValue = "true", matchIfMissing = true)
+    @ConditionalOnProperty(name = "mybatis.interceptor.enabled", havingValue = "true", matchIfMissing = true)
     @Bean
     public PermissionInterceptor permissionInterceptor() {
         return new PermissionInterceptor();

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -15,7 +16,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="CylinderFillingRecordDto", description="液化气体气瓶充装信息-充装记录")
+@ApiModel(value = "CylinderFillingRecordDto", description = "液化气体气瓶充装信息-充装记录")
 public class CylinderFillingRecordDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
@@ -69,7 +70,6 @@ public class CylinderFillingRecordDto  extends BaseDto {
     @ApiModelProperty(value = "异常情况")
     private String abnormalStr;
 
-
     @ApiModelProperty(value = "充装前检查时间")
     private String inspectionDate;
 
@@ -98,7 +98,6 @@ public class CylinderFillingRecordDto  extends BaseDto {
     @ApiModelProperty(value = "对接公司编码")
     private String appId;
 
-
     @ApiModelProperty(value = "是否在检验有效期以内")
     private String isValid;
 
@@ -135,5 +134,4 @@ public class CylinderFillingRecordDto  extends BaseDto {
     @ApiModelProperty(value = "气瓶粘贴警示标签和充装标签")
     private Integer warningSign;
 
-
 }

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

@@ -23,7 +23,7 @@ public class CylinderFillingDataUnit extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 上月充装量
+     * 本月充装量
      */
 	@TableField("total_sum")
     private Double totalSum;

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

@@ -14,7 +14,7 @@
     </select>
 
 
-    <select id="queryListByQueryDto" resultType="java.util.Map">
+    <select id="queryListByQueryDto">
         SELECT
         r.sequence_nbr AS sequenceNbr,
         r.filling_unit_name AS fillingUnitName,

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

@@ -2,7 +2,6 @@
 <!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.CylinderInfoMapper">
 
-
     <select id="queryNumAndOutOfDateNum" resultType="java.util.Map">
         SELECT
         count( sequence_nbr ) AS cylinderNum,
@@ -21,22 +20,22 @@
         )
     </select>
 
-    <select id="getLastMonthInfoTotal" 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 in (
+    <sql id="selectAPPIdByRegionCode">
         select u.app_id from tz_cylinder_unit u where u.region_code like CONCAT('%',#{regionCode},'%')
-        )
+    </sql>
+
+    <select id="getLastMonthInfoTotal" 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 in (<include refid="selectAPPIdByRegionCode"/>)
     </select>
 
     <select id="getMonthBeforeLastInfoTotal" 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 in (
-        select u.app_id from tz_cylinder_unit u where u.region_code like CONCAT('%',#{regionCode},'%')
-        )
+        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 in (<include refid="selectAPPIdByRegionCode"/>)
     </select>
 
     <select id="getInfoTotalByRegionCode" resultType="java.lang.Integer">
-        select count(sequence_nbr) from tz_cylinder_info where app_id in (
-        select u.app_id from tz_cylinder_unit u where u.region_code like CONCAT('%',#{regionCode},'%')
-        )
+        select count(sequence_nbr) from tz_cylinder_info where app_id in (<include refid="selectAPPIdByRegionCode"/>)
     </select>
 
     <select id="queryIntegirtyByAppId" resultType="java.lang.Double">
@@ -44,9 +43,7 @@
     </select>
 
     <select id="getWarnNum" resultType="java.lang.Integer">
-        select count(1) from view_cylider_outofdate v where v.app_id in (
-            select u.app_id from tz_cylinder_unit u where u.region_code like CONCAT('%',#{regionCode},'%')
-        )
+        select count(1) from view_cylider_outofdate v where v.app_id in (<include refid="selectAPPIdByRegionCode"/>)
     </select>
 
     <select id="getLastMonthInfoTotalUnit" resultType="java.lang.Integer">

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -2,14 +2,11 @@ package com.yeejoin.equipmanage.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
@@ -1671,6 +1668,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         return SourcesStatisticsImpl.PREFIX_CATEGORY_COUNT + row.get("bizOrgCode").toString() + "_" + SourceTypeEnum.EQUIPMENT.getCode() + "_" + row.get("categoryCode").toString();
     }
 
+    @Override
     public Boolean videoOnEquipmentSpecific(VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo) {
         Long equipmentSpecificId = videoOnEquipmentSpecificVo.getEquipmentSpecificId();
         List<Long> videoIdList = videoOnEquipmentSpecificVo.getVideoIdList();

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderAreaDataController.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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderAreaDataDto;
 import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderAreaDataServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 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.CylinderAreaDataDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
 
 /**
  * 气瓶区域统计表
@@ -67,7 +65,7 @@ public class CylinderAreaDataController extends BaseController {
     @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){
+    public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr){
         return ResponseHelper.buildResponse(cylinderAreaDataServiceImpl.removeById(sequenceNbr));
     }
 

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

 package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingRecordDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingRecord;
 import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingRecordMapper;
 import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderFillingRecordService;
-import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderFillingRecordDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.Date;
 import java.util.List;
@@ -20,7 +19,7 @@ import java.util.List;
  * @date 2022-03-04
  */
 @Service
-public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillingRecordDto,CylinderFillingRecord,CylinderFillingRecordMapper> implements ICylinderFillingRecordService {
+public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillingRecordDto, CylinderFillingRecord, CylinderFillingRecordMapper> implements ICylinderFillingRecordService {
     /**
      * 分页查询
      */
@@ -32,7 +31,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
      * 列表查询 示例
      */
     public List<CylinderFillingRecordDto> queryForCylinderFillingRecordList() {
-        return this.queryForList("" , false);
+        return this.queryForList("", false);
     }
 
     public Double queryIntegirtyByAppId(String appId) {
@@ -40,15 +39,26 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
     }
 
     public Double getFillingSum(String r, Date time) {
-        return this.baseMapper.getFillingSum(r,time);
+        return this.baseMapper.getFillingSum(r, time);
     }
 
     public Page<CylinderFillingRecordDto> queryListByQueryDto(Page<CylinderFillingRecordDto> page, CylinderFillingRecordDto cylinderFillingRecordDto, String sortParam, String sortRule) {
-        Page<List<CylinderFillingRecordDto>>list = this.baseMapper.queryListByQueryDto(page,cylinderFillingRecordDto.getFillingUnitName(),cylinderFillingRecordDto.getPropertyUnit(),cylinderFillingRecordDto.getFactoryNum(),
-                cylinderFillingRecordDto.getCylinderVariety(), cylinderFillingRecordDto.getQrCode(), cylinderFillingRecordDto.getElectronicLabelCode(),cylinderFillingRecordDto.getSequenceCode(),cylinderFillingRecordDto.getUnitInnerCode(),
-                cylinderFillingRecordDto.getFillingStarttime(), cylinderFillingRecordDto.getFillingEndtime(), sortParam,sortRule,cylinderFillingRecordDto.getAppId());
+        Page<List<CylinderFillingRecordDto>> list = this.baseMapper.queryListByQueryDto(
+                page,
+                cylinderFillingRecordDto.getFillingUnitName(),
+                cylinderFillingRecordDto.getPropertyUnit(),
+                cylinderFillingRecordDto.getFactoryNum(),
+                cylinderFillingRecordDto.getCylinderVariety(),
+                cylinderFillingRecordDto.getQrCode(),
+                cylinderFillingRecordDto.getElectronicLabelCode(),
+                cylinderFillingRecordDto.getSequenceCode(),
+                cylinderFillingRecordDto.getUnitInnerCode(),
+                cylinderFillingRecordDto.getFillingStarttime(),
+                cylinderFillingRecordDto.getFillingEndtime(),
+                sortParam, sortRule, cylinderFillingRecordDto.getAppId()
+        );
         Page<CylinderFillingRecordDto> page1 = new Page<>();
-        List<CylinderFillingRecordDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(list.getRecords()),CylinderFillingRecordDto.class);
+        List<CylinderFillingRecordDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(list.getRecords()), CylinderFillingRecordDto.class);
         page1.setCurrent(page.getCurrent());
         page1.setSize(page.getSize());
         page1.setTotal(list.getTotal());
@@ -57,14 +67,14 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
     }
 
     public Double getFillingSumByMonth(String appId, Date time) {
-        return baseMapper.getFillingSumByMonth(appId,time);
+        return baseMapper.getFillingSumByMonth(appId, time);
     }
 
     public Integer getFillingCountByMonth(String appId, Date time) {
-        return baseMapper.getFillingCountByMonth(appId,time);
+        return baseMapper.getFillingCountByMonth(appId, time);
     }
 
     public Double getFillingSumByDate(String appId, Date time) {
-        return baseMapper.getFillingSumByDate(appId,time);
+        return baseMapper.getFillingSumByDate(appId, time);
     }
 }
\ No newline at end of file

pom.xml

@@ -241,17 +241,23 @@
 			<dependency>
 				<groupId>com.baomidou</groupId>
 				<artifactId>mybatis-plus-generator</artifactId>
-				<version>3.2.0</version>
+				<version>3.4.0</version>
 			</dependency>
 			<dependency>
 				<groupId>com.baomidou</groupId>
 				<artifactId>mybatis-plus-boot-starter</artifactId>
-				<version>3.2.0</version>
+				<version>3.4.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.mybatis.spring.boot</groupId>
 				<artifactId>mybatis-spring-boot-starter</artifactId>
-				<version>2.1.0</version>
+				<version>2.1.2</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.mybatis</groupId>
+						<artifactId>mybatis</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>cn.jpush.api</groupId>
@@ -271,28 +277,37 @@
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
-        <repository>
+		<!--<repository>
 			<id>Releases</id>
 			<name>Releases</name>
-            <url>http://36.46.149.14:8081/nexus/content/repositories/releases/</url>
+			<url>http://4v059425e3.zicp.vip:13535/nexus/content/repositories/releases/</url>
 		</repository>
-
 		<repository>
 			<id>Snapshots</id>
 			<name>Snapshots</name>
-            <url>http://36.46.149.14:8081/nexus/content/repositories/snapshots/</url>
+			<url>http://4v059425e3.zicp.vip:13535/nexus/content/repositories/snapshots/</url>
 		</repository>
 		<repository>
 			<id>com.e-iceblue</id>
 			<name>e-iceblue</name>
 			<url>https://repo.e-iceblue.com/nexus/content/groups/public/</url>
+		</repository>-->
+		<repository>
+			<id>Releases</id>
+			<name>Releases</name>
+			<url>http://36.46.149.14:8081/nexus/content/repositories/releases/</url>
+		</repository>
+
+		<repository>
+			<id>Snapshots</id>
+			<name>Snapshots</name>
+			<url>http://36.46.149.14:8081/nexus/content/repositories/snapshots/</url>
 		</repository>
 	</repositories>
 
 	<modules>
 		<module>amos-boot-module</module>
 		<module>amos-boot-biz-common</module>
-		<module>amos-boot-system-avic</module>
 		<module>amos-boot-system-tzs</module>
 		<module>amos-boot-system-jcs</module>
 		<module>amos-boot-system-knowledgebase</module>