提交修改bug

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

@@ -82,10 +82,10 @@ public class CylinderInfoDto extends BaseDto {
     @ApiModelProperty(value = "数据完整度")
     private Double integrity;
 
-    @ApiModelProperty(value = "???")
+    @ApiModelProperty(value = "精度")
     private String longitude;
 
-    @ApiModelProperty(value = "γ?")
+    @ApiModelProperty(value = "纬度")
     private String latitude;
 
     @ApiModelProperty(value = "统一社会信用代码")
@@ -110,10 +110,10 @@ public class CylinderInfoDto extends BaseDto {
     private String typeExperiments;
 
     @ApiModelProperty(value = "阀门制造单位")
-    private Double valveManufacturUnit;
+    private String valveManufacturUnit;
 
     @ApiModelProperty(value = "公称工作压力(MPa）")
-    private String nominalWorkPressure;
+    private Double nominalWorkPressure;
 
     @ApiModelProperty(value = "设备品种名称")
     private String cylinderVarietyName;
@@ -145,5 +145,14 @@ public class CylinderInfoDto extends BaseDto {
      * 检验状态（已超期、即将超期）
      */
     private String inspectionStatusDesc;
+    
+    
+    private int isWarn = 0;
+    
+    private String qrCode;
+    
+    private String electronicLabelCode;
+    
+    private String cylinderStatusStr;
 
 }

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

@@ -103,5 +103,8 @@ public class CylinderUnitDto extends BaseDto {
      * 星级 （写死的★★★★★）
      */
     private String evaluate;
+   
+    
+    private boolean outOfDate = false;
 
 }

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

@@ -33,7 +33,7 @@ public class TzCylinderInfoDto {
     /**
      * 设备品种
      */
-    private Integer cylinderVariety;
+    private String cylinderVariety;
 
     @ApiModelProperty(value = "产品名称")
     /**
@@ -75,7 +75,7 @@ public class TzCylinderInfoDto {
     /**
      * 气瓶状态
      */
-    private Integer cylinderStatus;
+    private String cylinderStatus;
 
     @ApiModelProperty(value = "阀门制造单位")
     /**

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

@@ -109,10 +109,10 @@ public class CylinderInfo extends BaseEntity {
     private String typeExperiments;
 
     @ApiModelProperty(value = "阀门制造单位")
-    private Double valveManufacturUnit;
+    private String valveManufacturUnit;
 
     @ApiModelProperty(value = "公称工作压力(MPa）")
-    private String nominalWorkPressure;
+    private Double nominalWorkPressure;
 
     @ApiModelProperty(value = "设备品种名称")
     private String cylinderVarietyName;

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

@@ -23,6 +23,9 @@ public interface CylinderInfoMapper extends BaseMapper<CylinderInfo> {
      * @return
      */
     Map<String, String> queryNumAndOutOfDateNum(@Param("sequenceNbr")  Long sequenceNbr);
+    
+
+    Integer getMonthInfoTotal(@Param("regionCode") String regionCode);
 
     /**
      * 获取上个月气瓶总量
@@ -46,7 +49,9 @@ public interface CylinderInfoMapper extends BaseMapper<CylinderInfo> {
     Double queryIntegirtyByAppId(@Param("appId")  String appId);
 
     Integer getWarnNum(String code);
+    
 
+    Integer getMonthInfoTotalUnit(@Param("appId") String appId);
     /**
      * 获取上个月气瓶总量-APPID
      * @return

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

 package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInspection;
 
 /**
@@ -10,5 +12,7 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInspection;
  * @date 2022-03-04
  */
 public interface CylinderInspectionMapper extends BaseMapper<CylinderInspection> {
+	
+	Page<CylinderInfo> queryOutOfDateCylinder(Page<CylinderInfo> pageBean,String appId);
 
 }

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

@@ -32,4 +32,6 @@ public interface CylinderUnitMapper extends BaseMapper<CylinderUnit> {
     Integer getUnitTotalByRegionCode(@Param("regionCode") String regionCode);
 
     Integer getWarnNum(String code);
+    
+    Integer getWarnNumByAppId(String appId);
 }

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

@@ -16,7 +16,7 @@
         IFNULL(
                 sum(
                 case c.within_scope+c.sealed_state+c.defective+c.abnormal_temperature+c.warning_sign
-                    when 5 then 1
+                    when 15730 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>

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

@@ -15,7 +15,7 @@
         IFNULL(
         sum(
         case f.is_valid+f.same+f.is_regulations+f.is_compliance_withGBT+f.have_still_pressure+f.is_complete+f.have_security_documents
-        when 7 then 1
+        when 21920 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>

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

@@ -21,6 +21,11 @@
     <sql id="selectAPPIdByRegionCode">
         select u.app_id from tz_cylinder_unit u where u.region_code like CONCAT('%',#{regionCode},'%')
     </sql>
+    
+    <select id="getMonthInfoTotal" 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' ) ) =0 AND app_id in (<include refid="selectAPPIdByRegionCode"/>)
+    </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' ) ,
@@ -43,7 +48,11 @@
     <select id="getWarnNum" resultType="java.lang.Integer">
         select count(1) from view_cylider_outofdate v where v.app_id in (<include refid="selectAPPIdByRegionCode"/>)
     </select>
-
+    
+   <select id="getMonthInfoTotalUnit" 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' ) ) =0 AND app_id = #{appId}
+    </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>

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

@@ -2,4 +2,14 @@
 <!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.CylinderInspectionMapper">
 
+   <select id="queryOutOfDateCylinder" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo">
+	SELECT
+		* 
+	FROM
+	tz_cylinder_info info 
+	LEFT JOIN tz_cylinder_inspection ins ON ins.sequence_code = info.sequence_code
+	WHERE TO_DAYS(ins.next_inspection_date) - TO_DAYS(NOW()) &lt;= 20
+	     AND info.app_id = #{appId}
+
+    </select>
 </mapper>

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

@@ -19,5 +19,9 @@
             select u.app_id from tz_cylinder_unit u where u.region_code like CONCAT('%',#{regionCode},'%')
         )
     </select>
+    
+    <select id="getWarnNumByAppId" resultType="java.lang.Integer">
+        select count(1) from view_cylider_outofdate v where v.app_id =#{appId}
+    </select>
 
 </mapper>

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/AmosTzsApplication.java

@@ -104,22 +104,6 @@ public class AmosTzsApplication {
 
 	@Bean
 	public void initToken() {
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				cylinderInfoServiceImpl.synFillingUnloadData();
-				cylinderInfoServiceImpl.synAreaData();
-				cylinderInfoServiceImpl.addIntegrityData();
-				cylinderInfoServiceImpl.getCylinderUnitInfo();
-				cylinderInfoServiceImpl.getCylinderInfo();
-				cylinderInfoServiceImpl.synUnitCylinderInfoData();
-				cylinderInfoServiceImpl.synUnitCylinderFillingData();
-				cylinderInfoServiceImpl.synUnitCylinderTagsData();
-				cylinderInfoServiceImpl.synUnitIntegrityData();
-				cylinderInfoServiceImpl.synUnitFillingCheckData();
-				cylinderInfoServiceImpl.synFillingUnloadUnitData();
-			}
-		}).start();
 		startPlatformTokenService.getToken();
 	}
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/EquipmentCategoryController.java

 package com.yeejoin.amos.boot.module.tzs.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 com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.utils.Menu;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.EquipmentCategoryServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -12,8 +17,13 @@ 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.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tzs.api.dto.EquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategory;
+
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
@@ -28,76 +38,100 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 @RequestMapping(value = "/equipment-category")
 public class EquipmentCategoryController extends BaseController {
 
-    @Autowired
-    EquipmentCategoryServiceImpl equipmentCategoryServiceImpl;
+	@Autowired
+	EquipmentCategoryServiceImpl equipmentCategoryServiceImpl;
 
-    /**
-     * 新增装备分类
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	/**
+	 * 新增装备分类
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增装备分类", notes = "新增装备分类")
 	public ResponseModel<EquipmentCategoryDto> save(@RequestBody EquipmentCategoryDto model) {
-	    model = equipmentCategoryServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
+		model = equipmentCategoryServiceImpl.createWithModel(model);
+		return ResponseHelper.buildResponse(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(equipmentCategoryServiceImpl.removeById(sequenceNbr));
-    }
+	 * 根据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(equipmentCategoryServiceImpl.removeById(sequenceNbr));
+	}
 
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
+	/**
+	 * 根据sequenceNbr查询
+	 *
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个装备分类",  notes = "根据sequenceNbr查询单个装备分类")
+	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个装备分类", notes = "根据sequenceNbr查询单个装备分类")
 	public ResponseModel<EquipmentCategoryDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.queryBySeq(sequenceNbr));
+		return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.queryBySeq(sequenceNbr));
 	}
 
 	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
+	 * 列表分页查询
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "装备分类分页查询",  notes = "装备分类分页查询")
-	public ResponseModel<Page<EquipmentCategoryDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<EquipmentCategoryDto> page = new Page<EquipmentCategoryDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.queryForEquipmentCategoryPage(page));
+	@ApiOperation(httpMethod = "GET", value = "装备分类分页查询", notes = "装备分类分页查询")
+	public ResponseModel<Page<EquipmentCategoryDto>> queryForPage(@RequestParam(value = "current") int current,
+			@RequestParam(value = "size") int size) {
+		Page<EquipmentCategoryDto> page = new Page<EquipmentCategoryDto>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.queryForEquipmentCategoryPage(page));
 	}
 
 	/**
 	 * 列表全部数据查询
-     *
+	 *
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "装备分类列表全部数据查询",   notes = "装备分类列表全部数据查询")
+	@ApiOperation(httpMethod = "GET", value = "装备分类列表全部数据查询", notes = "装备分类列表全部数据查询")
 	@GetMapping(value = "/list")
 	public ResponseModel<List<EquipmentCategoryDto>> selectForList() {
-	    return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.queryForEquipmentCategoryList());
+		return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.queryForEquipmentCategoryList());
+	}
+
+	/**
+	 * 树
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "装备分类列表全部数据查询", notes = "装备分类列表全部数据查询")
+	@GetMapping(value = "/tree")
+	public ResponseModel<Object> tree(@RequestParam Long code) throws Exception {
+		EquipmentCategory root = equipmentCategoryServiceImpl
+				.getOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, code));
+		QueryWrapper<EquipmentCategory> queryWrapper = new QueryWrapper<>();
+		queryWrapper.likeRight("code", code.toString().replaceAll("0+$", ""));
+		Collection<EquipmentCategory> list = equipmentCategoryServiceImpl.list(queryWrapper);
+		Menu menu = new Menu(root.getId(), root.getName(), 0L, 0);
+		List<Menu> menus = TreeParser.getTree(root.getId(), list, EquipmentCategory.class.getName(), "getId", 0, "getName",
+				"getParentId", null, "getCode");
+		menu.setChildren(menus);
+		List<Menu> tree = new ArrayList<>();
+		tree.add(menu);
+		return ResponseHelper.buildResponse(tree);
 	}
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsJgServiceImpl.java

@@ -23,6 +23,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgProduceInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgRegistrationInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgSuperviseInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgUseInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgConstructionInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgDesignInfo;
@@ -98,6 +99,8 @@ public class TzsJgServiceImpl implements ITzsJgService {
 	@Autowired
 	ITzsJgEnclosureInfoService iTzsJgEnclosureInfoService;
 
+	@Autowired
+	EquipmentCategoryServiceImpl equipmentCategoryServiceImpl;
 	/**
 	 * 文件服务器地址
 	 */
@@ -113,6 +116,15 @@ public class TzsJgServiceImpl implements ITzsJgService {
 				tzsJgBasicInfoDto.setOrgBranchCode(result.getResult().getOrgCode());
 			}
 		}
+		if (tzsJgBasicInfoDto.getEquCategory() != null) {
+			EquipmentCategory equipmentCategory = equipmentCategoryServiceImpl
+					.getOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getId,
+							tzsJgBasicInfoDto.getEquCategory()));
+			if (equipmentCategory != null) {
+				tzsJgBasicInfoDto.setEquCategory(equipmentCategory.getCode().toString().replaceAll("0+$", ""));
+			}
+		}
+
 		Page<TzsJgBasicInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
 		return tzsJgMapper.page(page, tzsJgBasicInfoDto);
 	}
@@ -302,14 +314,14 @@ public class TzsJgServiceImpl implements ITzsJgService {
 				.list(new LambdaQueryWrapper<TzsJgEnclosureInfo>().eq(TzsJgEnclosureInfo::getSequenceCode, code));
 		List<TzsJgEnclosureInfoDto> enclosureInfoDtoList = new ArrayList<TzsJgEnclosureInfoDto>();
 		if (!enclosureInfoList.isEmpty()) {
-			for (TzsJgEnclosureInfo  enclosureInfo : enclosureInfoList) {
+			for (TzsJgEnclosureInfo enclosureInfo : enclosureInfoList) {
 				TzsJgEnclosureInfoDto enclosureInfoDtoOne = new TzsJgEnclosureInfoDto();
-				BeanUtils.copyProperties( enclosureInfo, enclosureInfoDtoOne);
-				//repairInform.forEach(e -> e.setFileUrl(fileServerUrl + e.getFileUrl()));
+				BeanUtils.copyProperties(enclosureInfo, enclosureInfoDtoOne);
+				// repairInform.forEach(e -> e.setFileUrl(fileServerUrl + e.getFileUrl()));
 				enclosureInfoDtoList.add(enclosureInfoDtoOne);
 			}
 		}
-		
+
 		dto.setSequenceCode(code);
 		if (superviseInfo != null) {
 			dto.setSuperviseCode(superviseInfo.getSuperviseCode());

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

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderUnitDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnit;
 import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderInfoService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderUnitService;
 import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderUnitServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,8 +37,8 @@ import java.util.Map;
 @RequestMapping(value = "/cylinder-unit")
 public class CylinderUnitController extends BaseController {
 
-    @Autowired
-    CylinderUnitServiceImpl cylinderUnitServiceImpl;
+	@Autowired
+	CylinderUnitServiceImpl cylinderUnitServiceImpl;
 
 	@Autowired
 	ICylinderInfoService iCylinderInfoService;
@@ -50,68 +51,72 @@ public class CylinderUnitController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/queryCylinderUnitList", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "通过regionCode查询气瓶企业", notes = "通过regionCode查询气瓶企业")
-	public ResponseModel<List<CylinderUnitDto>> querySpecialEquipmentList(@RequestParam String regionCode){
-		List<CylinderUnit> unitList = cylinderUnitServiceImpl.list(new LambdaQueryWrapper<CylinderUnit>().like(CylinderUnit::getRegionCode,regionCode));
+	public ResponseModel<List<CylinderUnitDto>> querySpecialEquipmentList(@RequestParam String regionCode) {
+		List<CylinderUnit> unitList = cylinderUnitServiceImpl
+				.list(new LambdaQueryWrapper<CylinderUnit>().like(CylinderUnit::getRegionCode, regionCode));
 
 		List<CylinderUnitDto> result = new ArrayList<>();
 		unitList.stream().forEach(t -> {
 			CylinderUnitDto temp = new CylinderUnitDto();
-			BeanUtils.copyProperties(t,temp);
-//			if(t.getFillingPermitDate() != null && t.getFillingPermitDate().getTime() < System.currentTimeMillis()) {
-//				temp.setOutOfDate(true);
-//			} else {
-//				temp.setOutOfDate(false);
-//			}
+			BeanUtils.copyProperties(t, temp);
+			int num = cylinderUnitServiceImpl.getWarnNumByAppId(t.getAppId());
+			if (num > 0) {
+				temp.setOutOfDate(true);
+			} else {
+				temp.setOutOfDate(false);
+			}
 			result.add(temp);
 		});
 		return ResponseHelper.buildResponse(result);
 	}
 
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param id  主键
-     * @return
-     */
+	/**
+	 * 根据sequenceNbr查询
+	 *
+	 * @param id 主键
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getUnitInfo")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶企业信息",  notes = "根据sequenceNbr查询单个气瓶企业信息")
+	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个气瓶企业信息", notes = "根据sequenceNbr查询单个气瓶企业信息")
 	public ResponseModel<CylinderUnitDto> selectOne(@RequestParam Long id) {
 		CylinderUnitDto unit = cylinderUnitServiceImpl.queryBySeq(id);
 		unit.setEvaluate("★★★★★");
 		// 查询气瓶数量以及过期数量
 		Map<String, String> cylinderInfo = iCylinderInfoService.queryNumAndOutOfDateNum(unit.getSequenceNbr());
-		if(cylinderInfo != null) {
-			if(cylinderInfo.get("cylinderNum") != null) {
+		
+		int num = cylinderUnitServiceImpl.getWarnNumByAppId(unit.getAppId());
+		if (cylinderInfo != null) {
+			if (cylinderInfo.get("cylinderNum") != null) {
 				unit.setCylinderNumber(Integer.valueOf(String.valueOf(cylinderInfo.get("cylinderNum"))));
 			}
-			if(cylinderInfo.get("outOfDateNum") != null) {
-				unit.setCylinderOutOfDate(String.valueOf(cylinderInfo.get("outOfDateNum")));
-			}
-			if(cylinderInfo.get("fillingPermitDate") != null){
+//			if (cylinderInfo.get("outOfDateNum") != null) {
+//				unit.setCylinderOutOfDate(String.valueOf(cylinderInfo.get("outOfDateNum")));
+//			}
+			unit.setCylinderOutOfDate(String.valueOf(num));
+			if (cylinderInfo.get("fillingPermitDate") != null) {
 				unit.setFillingPermitDate(String.valueOf(cylinderInfo.get("fillingPermitDate")));
 			}
 		}
-	    return ResponseHelper.buildResponse(unit);
+		return ResponseHelper.buildResponse(unit);
 	}
 
 	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
+	 * 列表分页查询
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "气瓶企业信息分页查询",  notes = "气瓶企业信息分页查询")
-	public ResponseModel<Page<CylinderUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<CylinderUnitDto> page = new Page<CylinderUnitDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(cylinderUnitServiceImpl.queryForCylinderUnitPage(page));
+	@ApiOperation(httpMethod = "GET", value = "气瓶企业信息分页查询", notes = "气瓶企业信息分页查询")
+	public ResponseModel<Page<CylinderUnitDto>> queryForPage(@RequestParam(value = "current") int current,
+			@RequestParam(value = "size") int size) {
+		Page<CylinderUnitDto> page = new Page<CylinderUnitDto>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(cylinderUnitServiceImpl.queryForCylinderUnitPage(page));
 	}
 
-
 }

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

 package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
 
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInspectionDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInspection;
 import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderInspectionMapper;
 import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderInspectionService;
-import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInspectionDto;
-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;
 
 /**
  * 气瓶检验信息服务实现类
@@ -16,18 +19,27 @@ import java.util.List;
  * @date 2022-03-04
  */
 @Service
-public class CylinderInspectionServiceImpl extends BaseService<CylinderInspectionDto, CylinderInspection,CylinderInspectionMapper> implements ICylinderInspectionService {
-    /**
-     * 分页查询
-     */
-    public Page<CylinderInspectionDto> queryForCylinderInspectionPage(Page<CylinderInspectionDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
+public class CylinderInspectionServiceImpl
+		extends BaseService<CylinderInspectionDto, CylinderInspection, CylinderInspectionMapper>
+		implements ICylinderInspectionService {
+	/**
+	 * 分页查询
+	 */
+	public Page<CylinderInspectionDto> queryForCylinderInspectionPage(Page<CylinderInspectionDto> page) {
+		return this.queryForPage(page, null, false);
+	}
+
+	/**
+	 * 列表查询 示例
+	 */
+	public List<CylinderInspectionDto> queryForCylinderInspectionList() {
+		return this.queryForList("", false);
+	}
 
-    /**
-     * 列表查询 示例
-     */
-    public List<CylinderInspectionDto> queryForCylinderInspectionList()   {
-        return this.queryForList("" , false);
-    }
+	/**
+	 * 列表查询 示例
+	 */
+	public Page<CylinderInfo> queryOutOfDateCylinder(Page<CylinderInfo> pageBean,String appId) {
+		return this.baseMapper.queryOutOfDateCylinder(pageBean,appId);
+	}
 }
\ No newline at end of file

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

@@ -61,4 +61,9 @@ public class CylinderUnitServiceImpl extends BaseService<CylinderUnitDto, Cylind
 //        return baseMapper.getWarnNum(code);
         return 0;
     }
+    
+    public int getWarnNumByAppId(String appId) 
+    {
+    	  return baseMapper.getWarnNumByAppId(appId);
+    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev2.properties

 #DB properties:
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://172.16.10.90:53306/tzs_amos_tzs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8\
-  &characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://36.46.151.113:23306/per_tzs_amos_tzs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 
-##eureka properties:
-eureka.client.service-url.defaultZone =http://172.16.3.99:10001/eureka/
-eureka.instance.prefer-ip-address=true
-management.endpoint.health.show-details=always
-management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://172.16.10.90:${server.port}${server.servlet.context-path}/actuator/health
-eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://172.16.10.90:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.10.90:${server.port}${server.servlet.context-path}/swagger-ui.html   
+#eureka properties:
+eureka.instance.hostname= eureka
+eureka.instance.prefer-ip-address = true
+eureka.client.serviceUrl.defaultZone =http://36.46.151.113:10001/eureka/
+eureka.instance.ip-address = 172.16.3.133
 
 ## ES properties:
-biz.elasticsearch.address=172.16.10.90
-spring.data.elasticsearch.cluster-name=elasticsearch
+biz.elasticsearch.address=36.46.151.113
+spring.data.elasticsearch.cluster-name=docker-cluster
 spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
 spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
 
-elasticsearch.username= elastic
-elasticsearch.password= 123456
+elasticsearch.username=elastic
+elasticsearch.password=123456
 
 ## unit(h)
 alertcall.es.synchrony.time=48
 
-fileserver.domain=https://rpm.yeeamos.com:8888/
+
 #redis properties:
 spring.redis.database=1
-spring.redis.host=172.16.10.90
-spring.redis.port=6379
+spring.redis.host=36.46.151.113
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1
@@ -40,20 +35,67 @@ spring.redis.lettuce.pool.min-idle=0
 spring.redis.expire.time=300
 
 ## emqx properties:
-emqx.clean-session=true
+emqx.clean-session=false
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.10.90:1883
-emqx.user-name=admin
-emqx.password=public
+emqx.broker=tcp://36.46.151.113:1883
+emqx.user-name=super
+emqx.password=123456
+emqx.keepAliveInterval=1000
+
+tzs.cti.appkey=4e805006-3fef-ae43-3915-a153731007c4
+tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
+tzs.cti.url=http://36.46.151.113:8000
+
+
+##wechatToken
+tzs.wechat.token=yeejoin_2021
+##wechatTicketUrl
+tzs.wechat.ticketurl=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=
+
+#tzs.wechat.tempId.kr=rjW8x9rRitIpa21Jekyx2nzBzpJy7tycssCXSN4YhWw
+tzs.wechat.tempId.kr=bxchKYhYW7aHbGKM2pVyR_yY2-bG4sRMNU3ZRQbMKYM
+tzs.wechat.url.kr=tzs.yeeamos.com/persondetail.html
+#tzs.wechat.tempId.wx=ofBIZS8Bup9s0zKbrGa8BfhVhS18H_hyC_OYXuBN6hI
+tzs.wechat.tempId.wx=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
+tzs.wechat.url.wx=tzs.yeeamos.com/repairPersondetail.html
+#tzs.wechat.tempId.ts=Kr7lcV8g4g_lgyW_RpwnNgw_HDxxRuVx759EoFWrIfU
+tzs.wechat.tempId.ts=VWqgY-lXFt4dg2EL4pLjfDCBAU49Z0mRxVaQhAMMW8Q
+tzs.wechat.url.ts=tzs.yeeamos.com/taskComplaintDetail.html
+
+mqtt.topic.task.newtask=tzs-task-newtask
+
+mqtt.topic.task.personinfo=tzs-task-personinfo
+
+mqtt.topic.elevator.push=/tzs/tcb_elevator
+
+mqtt.topic.alertInfo.push=/tzs/tcb_alertInfo
+
+mqtt.topic.alertReport.push=/tzs/tcb_alertReport
 
-tzs.cti.url=http://113.134.211.174:8000
+mqtt.topic.alertHeart.push=/tzs/tcb_alertHeart
 
-rule.definition.load=false
-rule.definition.model-package=com.yeejoin.amos.boot.module.tzs.api.dto
-rule.definition.default-agency=tzs
-#rule.definition.localIp=172.16.3.34
+mqtt.topic.alertMatrix.push=/tzs/tcb_alertMatrix
 
+mqtt.topic.cti.push=/cti/record
+
+cti.user.name=tzs_cti
+
+cti.user.pwd=a1234567
+
+flc.sms.tempCode=SMS_TZS_0001
+
+
+
+## \u9884\u8B66\u901A\u77E5\u6A21\u677Fid
+tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
+##\u7763\u67E5\u6574\u6539\u901A\u77E5
+tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
+
+## \u516C\u4F17\u53F7\u6D4B\u8BD5\u7528\u6237id\uFF08\u5E73\u53F0userId\uFF09
+tzs.wechat.test.userId=3413513
+
+
+fileserver.domain=https://rpm.yeeamos.com:8888/
 org.filter.group.seq=1564150103147573249
 
-elasticsearch.username= elastic
-elasticsearch.password= Yeejoin@2020
+duty.seats.role.ids=1585956200472674305,1585956257590706177
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application.properties

-spring.application.name=TZS
+spring.application.name=TZS-wj
 server.servlet.context-path=/tzs
 server.port=11000
-spring.profiles.active=dev
+spring.profiles.active=dev2
 
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/logback-dev2.xml

@@ -43,7 +43,7 @@
     <logger name="org.apache.activemq" level="INFO"/>
     <logger name="org.typroject" level="INFO"/>
     <logger name="com.yeejoin" level="INFO"/>
-
+    <logger name="org.apache.http" level="ERROR"/>
     <!-- 日志输出级别 -->
     <root level="DEBUG">
     <!-- <appender-ref ref="FILE" /> -->