气瓶充装信息存es修改

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

@@ -82,25 +82,25 @@ public class ESCylinderFillingRecordDto {
 
     //异常情况
     @Field(type = FieldType.Integer)
-    private Integer abnormal;
+    private String abnormalStr;
 
 
     //充装前检查人员姓名
     @Field(type = FieldType.Text)
-    private String inspectorUserBefore;
+    private String inspectorUser;
 
     //充装前检查时间
     @Field(type = FieldType.Text)
-    private String inspectionDateBefore;
+    private String inspectionDate;
 
     //充装前检查结果
     @Field(type = FieldType.Text)
-    private String checkResultsBefore;
+    private String fillingResult;
 
 
     //重装后检查人员姓名
     @Field(type = FieldType.Text)
-    private String inspectorAfter;
+    private String inspector;
 
     //重装后检查时间
     @Field(type = FieldType.Text)
@@ -108,7 +108,7 @@ public class ESCylinderFillingRecordDto {
 
     //重装后检查结果
     @Field(type = FieldType.Text)
-    private String checkResultsAfter;
+    private String checkResult;
 
     //appid
     @Field(type = FieldType.Text)

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

@@ -55,5 +55,5 @@ public interface CylinderFillingRecordMapper extends BaseMapper<CylinderFillingR
 
     Double getFillingSumByDate(@Param("appId") String appId,@Param("time") Date time);
 
-    ESCylinderFillingRecordDto getCyinderFillingRecordInfo(String sequenceCode);
+    ESCylinderFillingRecordDto getCyinderFillingRecordInfo(String appId, String sequenceCode);
 }

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

@@ -148,6 +148,7 @@
 
     <select id="getCyinderFillingRecord" resultType="com.yeejoin.amos.boot.module.tzs.api.entity.ESCylinderFillingRecordDto">
         SELECT
+            DISTINCT( r.filling_record_id),
             r.sequence_nbr AS sequenceNbr,
             r.filling_startTime AS fillingStarttime,
             r.filling_endTime AS fillingEndtime,
@@ -156,28 +157,32 @@
             r.temperature AS temperature,
             CASE
                 r.abnormal
-                WHEN 0 THEN
+                WHEN 3139 THEN
                     '有异常'
-                WHEN 1 THEN
+                WHEN 3140 THEN
                     '正常' ELSE''
                 END AS abnormalStr,
-            b.inspector_user AS inspectorUserBefore,
-            b.inspection_date AS inspectionDateBefore,
-            b.check_results AS checkResultsBefore,
+            b.inspector_user AS inspectorUser,
+            b.inspection_date AS inspectionDate,
+            b.check_results AS fillingResult,
             b.sequence_code AS sequenceCode,
+            b.app_id AS appId,
             b.filling_unit_name AS fillingUnitName,
-            af.inspector AS inspectorAfter,
+            af.inspector AS inspector,
             af.inspection_date AS inspectionDateAfter,
-            af.check_results AS checkResultsAfter
+            af.check_results AS checkResult
         FROM
             tz_cylinder_filling_record r
                 LEFT JOIN tz_cylinder_filling b ON b.filling_before_id = r.filling_before_id
-                AND date_format ( to_timestamp(b.inspection_date/1000)::date, '%Y-%m-%d' ) = date_format ( r.filling_startTime, '%Y-%m-%d' )
+                AND r.filling_before_id is NOT null
+                AND date_format (b.inspection_date, '%Y-%m-%d') = date_format ( r.filling_startTime, '%Y-%m-%d' )
                 LEFT JOIN tz_cylinder_filling_check af ON af.filling_check_id = r.filling_check_id
-                AND date_format ( to_timestamp(af.inspection_date/1000)::date, '%Y-%m-%d' ) = date_format ( r.filling_startTime, '%Y-%m-%d' )
+                AND date_format (af.inspection_date,'%Y-%m-%d') = date_format ( r.filling_startTime, '%Y-%m-%d' )
                 LEFT JOIN tz_cylinder_info i ON b.sequence_code = i.sequence_code
         WHERE
             r.is_not_es IS NULL
+          AND b.inspection_date not like '16%'
+        ORDER BY r.filling_record_id
     </select>
 
     <select id="getCyinderFillingRecordInfo"
@@ -201,5 +206,6 @@
                 LEFT JOIN tz_cylinder_unit AS tn ON ci.app_id = tn.app_id
         where
             ci.sequence_code = #{sequenceCode}
+        and ci.app_id = #{appId}
     </select>
 </mapper>

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

@@ -25,7 +25,6 @@ import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -145,7 +144,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
             if(!ObjectUtils.isEmpty(cylinderFillingRecordPage)){
                 cylinderFillingRecordPage.getRecords().stream().map(item->{
                     if(!ObjectUtils.isEmpty(item.getSequenceCode())){
-                        ESCylinderFillingRecordDto cyinderFillingRecordInfo = cylinderFillingRecordMapper.getCyinderFillingRecordInfo(item.getSequenceCode());
+                        ESCylinderFillingRecordDto cyinderFillingRecordInfo = cylinderFillingRecordMapper.getCyinderFillingRecordInfo(item.getAppId(),item.getSequenceCode());
                         item.setUnitName(cyinderFillingRecordInfo.getUnitName());
                         item.setFactoryNum(cyinderFillingRecordInfo.getFactoryNum());
                         item.setCylinderVariety(cyinderFillingRecordInfo.getCylinderVariety());
@@ -171,24 +170,26 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
     public Page<ESCylinderFillingRecordDto> getCyinderFillingRecord(Page<ESCylinderFillingRecordDto> cylinderFillingRecordDto) {
         Page<ESCylinderFillingRecordDto> cyinderFillingRecord = cylinderFillingRecordMapper.getCyinderFillingRecord(cylinderFillingRecordDto);
         if(!ObjectUtils.isEmpty(cyinderFillingRecord)){
-            cyinderFillingRecord.getRecords().stream().map(item->{
-                if(!ObjectUtils.isEmpty(item.getSequenceCode())){
-                    ESCylinderFillingRecordDto cyinderFillingRecordInfo = cylinderFillingRecordMapper.getCyinderFillingRecordInfo(item.getSequenceCode());
-                    item.setUnitName(cyinderFillingRecordInfo.getUnitName());
-                    item.setFactoryNum(cyinderFillingRecordInfo.getFactoryNum());
-                    item.setCylinderVariety(cyinderFillingRecordInfo.getCylinderVariety());
-                    item.setCylinderVarietyName(cyinderFillingRecordInfo.getCylinderVarietyName());
-                    item.setUnitInnerCode(cyinderFillingRecordInfo.getUnitInnerCode());
-                    item.setSequenceCode(cyinderFillingRecordInfo.getSequenceCode());
-                    item.setQrCode(cyinderFillingRecordInfo.getQrCode());
-                    item.setElectronicLabelCode(cyinderFillingRecordInfo.getElectronicLabelCode());
-                    item.setAppId(cyinderFillingRecordInfo.getAppId());
-                    item.setCreditCode(cyinderFillingRecordInfo.getCreditCode());
+            cyinderFillingRecord.getRecords().stream().map(item -> {
+                if (!ObjectUtils.isEmpty(item.getSequenceCode())) {
+                    ESCylinderFillingRecordDto cyinderFillingRecordInfo = cylinderFillingRecordMapper.getCyinderFillingRecordInfo(item.getAppId(), item.getSequenceCode());
+                    if (!ObjectUtils.isEmpty(cyinderFillingRecordInfo)) {
+                        item.setUnitName(cyinderFillingRecordInfo.getUnitName());
+                        item.setFactoryNum(cyinderFillingRecordInfo.getFactoryNum());
+                        item.setCylinderVariety(cyinderFillingRecordInfo.getCylinderVariety());
+                        item.setCylinderVarietyName(cyinderFillingRecordInfo.getCylinderVarietyName());
+                        item.setUnitInnerCode(cyinderFillingRecordInfo.getUnitInnerCode());
+                        item.setSequenceCode(cyinderFillingRecordInfo.getSequenceCode());
+                        item.setQrCode(cyinderFillingRecordInfo.getQrCode());
+                        item.setElectronicLabelCode(cyinderFillingRecordInfo.getElectronicLabelCode());
+                        item.setAppId(cyinderFillingRecordInfo.getAppId());
+                        item.setCreditCode(cyinderFillingRecordInfo.getCreditCode());
+                    }
                 }
                 return item;
             }).collect(Collectors.toList());
         }
-        return cylinderFillingRecordMapper.getCyinderFillingRecord(cylinderFillingRecordDto);
+        return cyinderFillingRecord;
     }
 
     @Override
@@ -344,10 +345,8 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
 
     @Override
     public ESCylinderFillingRecordDto saveCylinderFillingRecordToES(ESCylinderFillingRecordDto ci) {
-        ESCylinderFillingRecordDto esCylinderFillingRecordDto = new ESCylinderFillingRecordDto();
-        BeanUtils.copyProperties(ci, esCylinderFillingRecordDto);
 
-        ESCylinderFillingRecordDto recordDto = esCylinderFillingRecordRepository.save(esCylinderFillingRecordDto);
+        ESCylinderFillingRecordDto recordDto = esCylinderFillingRecordRepository.save(ci);
         if (!ObjectUtils.isEmpty(recordDto)) {
             //同步到es后修改
             CylinderFillingRecord cylinderFillingRecord = new CylinderFillingRecord();