Merge branch 'developer' into develop_unit_register

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/CylinderPageController.java

@@ -6,29 +6,18 @@ import com.yeejoin.amos.api.common.restful.utils.ResponseModel;
 import com.yeejoin.amos.api.openapi.face.model.CylinderTableModel;
 import com.yeejoin.amos.api.openapi.face.model.CylinderUnitTree;
 import com.yeejoin.amos.api.openapi.face.orm.entity.OpenapiBizToken;
-import com.yeejoin.amos.api.openapi.face.service.CylinderDateInfoService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderFillingCheckService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderFillingExamineService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderFillingRecordService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderFillingService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderInfoService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderInspectionService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderTagsService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderUnitService;
-import com.yeejoin.amos.api.openapi.face.service.OpenapiBizTokenService;
+import com.yeejoin.amos.api.openapi.face.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.doc.TycloudResource;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -92,7 +81,7 @@ public class CylinderPageController {
 																	 @RequestParam(value = "startTime",required = false) String startTime,
 																	 @RequestParam(value = "endTime",required = false) String endTime)  {
         // 先同步或者更新今日数据
-        cylinderDateInfoService.updateTodayDate();
+//        cylinderDateInfoService.updateTodayDate();
         // 查询数据
         List<CylinderTableModel> result = cylinderDateInfoService.selectTodayDate(serviceName, appId, startTime, endTime);
 		return ResponseHelper.buildResponse(result);

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderFillingModel.java

@@ -28,6 +28,10 @@ public class CylinderFillingModel extends AbstractBaseModel{
 	private String fillBeforeItem;	//	新投入使用气瓶或经检验后首次投入使用气瓶，充装前应按照规定先置换瓶内空气，并经分析合格后方可充气
 	private String checkResults;	//检查结果
 	private String nonconformances;	//不合格项
+	/**
+	 * 充装前检查id
+	 */
+	private String fillingBeforeId;
 
 
 

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderInfoModel.java

@@ -31,5 +31,14 @@ public class CylinderInfoModel extends AbstractBaseModel{
 	private int cylinderStatus;
 	private String valveManufacturUnit;
 	private Double nominalWorkPressure;
+	/**
+	 * 设备品种名称
+	 */
+	private String cylinderVarietyName;
+
+	/**
+	 * 充装介质名称
+	 */
+	private String fillingMediaName;
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderUnitModel.java

@@ -24,4 +24,9 @@ public class CylinderUnitModel extends AbstractBaseModel{
 	private String securityAdm;
 	private String securityAdmPhone;
 	private String postalCode;	//企业邮编
+
+	/**
+	 * 所属区域
+	 */
+	private String regionName;
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/CylinderFilling.java

@@ -49,6 +49,11 @@ public class CylinderFilling  extends AbstractBaseEntity{/**
 	private String nonconformances;
 	@TableField("check_results")
 	private String checkResults;
+	/**
+	 * 充装前检查id
+	 */
+	@TableField("filling_before_id")
+	private String fillingBeforeId;
 
 
 

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/CylinderInfo.java

@@ -74,5 +74,16 @@ public class CylinderInfo  extends AbstractBaseEntity{
 
 	@ApiModelProperty(value = "公称工作压力(MPa）")
 	private Double nominalWorkPressure;
+
+	/**
+	 * 设备品种名称
+	 */
+	private String cylinderVarietyName;
+
+	/**
+	 * 充装介质名称
+	 */
+	private String fillingMediaName;
+
 	
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/CylinderUnit.java

@@ -64,4 +64,9 @@ public class CylinderUnit  extends AbstractBaseEntity{/**
 	private String manufacturingScope;	//制造许可范围
 	@TableField("manufacturing_unit_code")
 	private String manufacturingUnitCode;	//制造单位代码
+
+	/**
+	 * 所属区域
+	 */
+	private String regionName;
 }

amos-boot-data/amos-boot-data-openapi/src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.profiles.active=dev
 server.compression.enabled=true
 spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss
 
-logging.config=classpath:logback-dev.xml
+logging.config=classpath:logback-${spring.profiles.active}.xml
 #设置文件上传的大小限制
 spring.servlet.multipart.maxFileSize=3MB
 spring.servlet.multipart.maxRequestSize=3MB

amos-boot-data/amos-boot-data-openapi/src/main/resources/logback-cyl.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="/opt/log/qa" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/openapicyl.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>7</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <MaxFileSize>20mb</MaxFileSize>
+        </triggeringPolicy>
+    </appender>
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="ERROR"/>
+    <logger name="org.mybatis" level="ERROR" />
+    <logger name="java.sql.Connection" level="ERROR"/>
+    <logger name="java.sql.Statement" level="ERROR"/>
+    <logger name="java.sql.PreparedStatement" level="ERROR"/>
+    <logger name="com.baomidou.mybatisplus" level="ERROR"/>
+
+    <logger name="org.typroject" level="ERROR"/>
+    <logger name="com.yeejoin" level="ERROR"/>
+    <logger name="org.springframework" level="INFO"/>
+
+
+
+
+    <!-- 日志输出级别 -->
+    <root level="ERROR">
+        <appender-ref ref="FILE" />
+    </root>
+</configuration>
\ No newline at end of file

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

@@ -4,7 +4,7 @@
     <select id="getPage" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.IdxUjerDto">
         SELECT *, IF(b.id is null, '未建', '已建') as bizType
         FROM idx_biz_odgu a
-        LEFT JOIN idx_biz_ujer b on a.companyId = b.companyId
+        LEFT JOIN idx_biz_ujer b on a.business_name = b.business_name
         <where>
             <if test="ids !=null and ids.size()>0">
                 AND a.companyId in

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

@@ -229,7 +229,7 @@ public class InspectionServiceImpl implements InspectionService {
     }
 
     private static JSONObject findCompanyById(JSONObject treeNode, Object companyId) {
-        if (treeNode.getString("sequenceNbr").equals(companyId)) {
+        if (treeNode.getString("sequenceNbr").equals(String.valueOf(companyId))) {
             return treeNode;
         } else {
             JSONArray children = treeNode.getJSONArray("children");