Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-data/amos-boot-data-accessapi/src/main/resource/application-dev.properties → amos-boot-data/amos-boot-data-accessapi/src/main/resources/application-dev.properties

@@ -44,8 +44,8 @@ eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
 emqx.clean-session=true
 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.client-user-name=admin
+emqx.client-password=public
 
 ##biz custem properties
 biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
\ No newline at end of file

amos-boot-data/amos-boot-data-accessapi/src/main/resource/logback-dev.xml → amos-boot-data/amos-boot-data-accessapi/src/main/resources/logback-dev.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_HOME" value="log" />
+    <property name="LOG_HOME" value="/opt/log/qa" />
     <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
     <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
     <!-- 按照每天生成日志文件 -->
@@ -10,9 +10,9 @@
             <!--日志文件输出的文件名-->
             <FileNamePattern>${LOG_HOME}/tzs.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
-            <MaxHistory>30</MaxHistory>
+            <MaxHistory>7</MaxHistory>
             <!--日志文件大小-->
-            <MaxFileSize>30mb</MaxFileSize>
+            <MaxFileSize>10mb</MaxFileSize>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>${LOG_PATTERN}</pattern>
@@ -46,7 +46,7 @@
 
     <!-- 日志输出级别 -->
     <root level="DEBUG">
-    <!-- <appender-ref ref="FILE" /> -->
+        <appender-ref ref="FILE" />
         <appender-ref ref="STDOUT" />
     </root>
 </configuration>
\ No newline at end of file

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Value;
+
 import java.util.Date;
 
 /**
@@ -42,4 +44,6 @@ public class CylinderFillingDataUnitDto  extends BaseDto {
     @ApiModelProperty(value = "充装月份")
     private String fillingMonth;
 
+    @ApiModelProperty(value = "充装日期")
+    private String fillingDate;
 }

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

@@ -3,6 +3,7 @@ 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 io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -64,4 +65,9 @@ public class CylinderFillingDataUnit extends BaseEntity {
 	@TableField("filling_month")
     private String fillingMonth;
 
+    /**
+     * 充装日期
+     */
+    @TableField("filling_date")
+    private String fillingDate;
 }

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

@@ -46,10 +46,10 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 	@Value("${amos.secret.key}")
 	String secretKey;
 
-	@Value("${admin.product}")
+	@Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
 	String product;
 
-	@Value("${admin.appkey}")
+	@Value("${amos.system.user.app-key:AMOS_STUDIO}")
 	String appkey;
 	@Autowired
 	RedisUtil redisUtil;

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

@@ -39,10 +39,10 @@ public class CarcylUnitInspectMqTtlListener extends EmqxListener {
 	@Value("${amos.secret.key}")
 	String secretKey;
 
-	@Value("${admin.product}")
+	@Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
 	String product;
 
-	@Value("${admin.appkey}")
+	@Value("${amos.system.user.app-key:AMOS_STUDIO}")
 	String appkey;
 	@Autowired
 	RedisUtil redisUtil;

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

@@ -18,10 +18,10 @@ public class PrivilegeCompanyDeleteListener extends EmqxListener {
     @Autowired
     RedisUtil redisUtil;
 
-    @Value("${admin.product}")
+    @Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
     String product;
 
-    @Value("${admin.appkey}")
+    @Value("${amos.system.user.app-key:AMOS_STUDIO}")
     String appkey;
 
 

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

@@ -2,27 +2,19 @@ package com.yeejoin.amos.boot.module.tzs.biz.listener;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.injector.methods.Update;
-import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
-import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzBaseEnterpriseInfoServiceImpl;
-import com.yeejoin.amos.boot.module.tzs.biz.utils.DesUtil;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.tzs.flc.api.feign.AccessFeignService;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 
 import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.ApplicationModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import lombok.extern.slf4j.Slf4j;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialRingGF2;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -32,12 +24,13 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Component
 @Slf4j
 public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
 
+    Logger logger = LoggerFactory.getLogger(PrivilegeCompanyUpdateAddListener.class);
+
     @Autowired
     TzBaseEnterpriseInfoServiceImpl tzBaseEnterpriseInfoService;
 
@@ -47,15 +40,15 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
     @Autowired
     RedisUtil redisUtil;
 
-    @Value("${admin.product}")
+    @Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
     String product;
 
-    @Value("${admin.appkey}")
-    String appkey;
+    @Value("${amos.system.user.app-key:AMOS_STUDIO}")
+    String appKey;
 
     @Override
     public void processMessage(String s, MqttMessage message) throws Exception {
-        System.out.println(message);
+        logger.info("received mqtt message: " + message);
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -65,7 +58,7 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         } catch (Exception e) {
             throw new Exception("公司同步消息解析失败");
         }
-        RequestContext.setAppKey(appkey);
+        RequestContext.setAppKey(appKey);
         RequestContext.setProduct(product);
         RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
 
@@ -107,15 +100,13 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
 
         //业务表更新条件构造器
         UpdateWrapper<TzBaseEnterpriseInfo> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("Use_code",object.getString("unit_code"));
-
-
+        updateWrapper.eq("use_code",object.getString("unit_code"));
 
         String regCode = object.getString("reg_code");
-        CompanyModel privilegeCompanyModel = Privilege.companyClient.queryByCompanyCode(regCode).getResult();
+        CompanyModel supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode(regCode).getResult();
 
-        if(ValidationUtil.isEmpty(privilegeCompanyModel)){
-            privilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000").getResult();
+        if(ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)){
+            supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000").getResult();
         }
         if(ValidationUtil.isEmpty(tzBaseEnterpriseInfo.getUnitType())){
             tzBaseEnterpriseInfo.setUnitType("");
@@ -125,19 +116,20 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         }
 
         try {
-            tzBaseEnterpriseInfo.setSuperviseOrgCode(privilegeCompanyModel.getOrgCode());
-            tzBaseEnterpriseInfo.setSuperviseOrgName(privilegeCompanyModel.getCompanyName());
-            companyModel.setParentId(privilegeCompanyModel.getSequenceNbr());
-        } catch (Exception e) {
-            System.out.println("名称为"+object.getString("unit_name")+"的许可企业同步企业信息时出错："+e.getMessage());
+            if (ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)) {
+                logger.error("【" + object.getString("unit_name") + "】对应监管企业为空");
+                return;
             }
+            tzBaseEnterpriseInfo.setSuperviseOrgCode(supervisePrivilegeCompanyModel.getOrgCode());
+            tzBaseEnterpriseInfo.setSuperviseOrgName(supervisePrivilegeCompanyModel.getCompanyName());
+            companyModel.setParentId(supervisePrivilegeCompanyModel.getSequenceNbr());
 
-        try {
             if (tzBaseEnterprisePrivilegeInfo == null && companyPrivilegeModel == null) {
                 //当企业表、平台表 中没有时
                 tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
                 Privilege.companyClient.create(companyModel);
                 accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
+                logger.info("create/update unit license info: " + "企业表、平台表中没有该条数据");
             } else if(tzBaseEnterprisePrivilegeInfo == null){
                 //企业表没有，平台表有
                 if(!ValidationUtil.isEmpty(companyPrivilegeModel.getCompanyType())){
@@ -150,6 +142,7 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
                 tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
                 Privilege.companyClient.update(companyModel, companyPrivilegeModel.getSequenceNbr());
                 accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
+                logger.info("create/update unit license info: " + "企业表没有、平台表中有该条数据");
             } else if(companyPrivilegeModel == null){
                 //平台表没有，企业表有
                 if(!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo.getUnitType())){
@@ -163,6 +156,7 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
                 Privilege.companyClient.create(companyModel);
                 tzBaseEnterpriseInfoService.update(tzBaseEnterpriseInfo,updateWrapper);
                 accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
+                logger.info("create/update unit license info: " + "企业表有、平台表中没有该条数据");
             }
             else {
                 //当企业表、平台表 中有时
@@ -205,9 +199,10 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
                     System.out.println("该数据不是最新的数据 不用更新");
                     accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
                 }
+                logger.info("create/update unit license info: " + "企业表有、平台表中有该条数据");
             }
         } catch(Exception e) {
-            System.out.println("名称为"+object.getString("unit_name")+"的公司:"+e.getMessage());
+            logger.error("【" + object.getString("unit_name") + "】许可信息同步【失败】:" + e.getMessage());
         }
     }
 

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

@@ -441,6 +441,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
 				String monthStr = month < 10 ? "0" + month : month + "";
 				temp.setFillingYear(year);
 				temp.setFillingMonth(monthStr);
+				temp.setFillingDate(year+"-"+monthStr);
 				// 本月
 				Double thisMonth = cylinderFillingRecordServiceImpl.getFillingSumByMonth(cylinderUnit.getAppId(),
 						calendar.getTime());

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

@@ -141,8 +141,9 @@ spring.security.user.name=admin
 spring.security.user.password=a1234560
 spring.security.user.roles=SBA_ADMIN
 
-amos.system.user.user-name=admin_tzs
-amos.system.user.password=a1234560
+## 后台执行机器人账号配置
+amos.system.user.user-name=tzs_cti
+amos.system.user.password=a1234567
 amos.system.user.app-key=AMOS_STUDIO
 amos.system.user.product=AMOS_STUDIO_WEB
 

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/RectifyMsgEnum.java

+package com.yeejoin.amos.boot.module.ugp.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 告知、问题短信通知枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum RectifyMsgEnum {
+    告知短信("告知短信", "0"),
+    问题短信("问题短信", "1");
+    private String name;
+    private String state;
+
+    public static final Map<String, String> map = new HashMap<>();
+
+    static {
+        for (WeldMethodEnum weldMethodEnum : WeldMethodEnum.values()) {
+            map.put(weldMethodEnum.getState(), weldMethodEnum.getName());
+        }
+    }
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/StageEnum.java

@@ -15,9 +15,9 @@ import java.util.Map;
 @AllArgsConstructor
 public enum  StageEnum {
 
-    焊前人员("焊前确定","STAFF","人员","人员校验"),
-    焊前设备("焊前确定","EQUIPMENT","设备","设备校验"),
-    焊前管材质量("焊前确定","BEFORE-WELDING","管材","管材校验"),
+    焊前人员("人员确定","STAFF","人员","人员校验"),
+    焊前设备("设备确定","EQUIPMENT","设备","设备校验"),
+    焊前管材质量("管材确定","BEFORE-WELDING","管材","管材校验"),
     焊接工艺("工艺确定","CRAFT","工艺","工艺校验"),
     管道耐压("耐压确定","VOLTAGE","耐压","耐压校验"),
     敷设质量("敷设确定","LAY","敷设","敷设校验"),

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/WeldDto.java

@@ -49,7 +49,6 @@ public class WeldDto  extends BaseDto {
     @ApiModelProperty(value = "赋码日期")
     private Date codingDate;
 
-
     @ApiModelProperty(value = "监察单位")
     private String superviseDept;
 
@@ -59,9 +58,13 @@ public class WeldDto  extends BaseDto {
     @ApiModelProperty(value = "检验检测单位负责人")
     private String insPerson;
 
+    @ApiModelProperty(value = "经度")
+    private String longitude;
 
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
 
-
-
+    @ApiModelProperty(value = "焊口状态(0-进行中，1-已完成)")
+    private Integer status;
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Weld.java

@@ -70,4 +70,23 @@ public class Weld extends BaseEntity {
 	@TableField("coding_date")
     private Date codingDate;
 
+    /**
+     *经度
+     */
+    @TableField("longitude")
+    private String longitude;
+
+    /**
+     *纬度
+     */
+    @TableField("latitude")
+    private String latitude;
+
+    /**
+     *焊口状态(0-进行中，1-已完成)
+     */
+    @TableField("status")
+    private Integer status;
+
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/VerifyMapper.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,6 +36,8 @@ public interface VerifyMapper extends BaseMapper<Verify> {
     Verify selectByCode(String code,Long projectId,String stage,Long random);
     List<CodeWeldDto> getCode();
     List<Verify> getVerity(String code);
+    Verify getOnes(Long projectId , String time,String code,String manyCode);
+
 
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/WeldMapper.java

@@ -31,4 +31,7 @@ public interface WeldMapper extends BaseMapper<Weld> {
 
     @Select("select * from tz_ugp_weld where `code` =#{code}")
     WeldDto getSqe(@Param("code") String code);
+
+    List<Weld> getWeldList(String region,@Param("ids")Set<String> ids);
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/quartz/CylinderSchedulerJob.java

@@ -6,7 +6,11 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.stream.Stream;
 
 @Component
 @EnableScheduling
@@ -15,24 +19,46 @@ public class CylinderSchedulerJob {
     /**
      * 每天3点-删除图片
      */
-    @Scheduled(cron = "${cylinder-early-warning-cron:0 0 19 * * ?}")
-    public void clean() {
-        dayReport(new File("/home/yeejoin/ugp/minio-data/upload/common/ugp/qrcode"));
-    }
+//    @Scheduled(cron = "${cylinder-early-warning-cron:0 0 19 * * ?}")
+//    public void clean() {
+//        dayReport(new File("/home/yeejoin/ugp/minio-data/upload/common/ugp/qrcode"));
+//    }
 
 
-    public static void dayReport(File file) {
-//        file.isAbsolute();
-        if (!ValidationUtil.isEmpty(file.listFiles())) {
-            for (File f : file.listFiles()) {
-                //实现递归
-                if (f.isDirectory()) {
-                    dayReport(f);
-                }
-                //清理文件
-                f.delete();
-                System.out.println(f.getName() + "已清理!!!");
+//    public static void dayReport(File file) {
+////        file.isAbsolute();
+//        if (!ValidationUtil.isEmpty(file.listFiles())) {
+//            for (File f : file.listFiles()) {
+//                //实现递归
+//                if (f.isDirectory()) {
+//                    dayReport(f);
+//                }
+//                //清理文件
+//                f.delete();
+//                System.out.println(f.getName() + "已清理!!!");
+//            }
+//        }
+//    }
+    @Scheduled(cron = "${cylinder-early-warning-cron:0 0 12 * * ?}")
+    public void cleanFile() throws IOException {
+        deleteFile("/home/yeejoin/ugp/minio-data/upload/common/ugp/ceshi");
     }
+
+    public static void deleteFile(String destDirPath) throws IOException {
+        System.out.println("开始删除文件 destDirPath:{}");
+        Process p;
+        InputStreamReader inputStreamReader = null;
+        BufferedReader br = null;
+        String co = "rm -rf " + destDirPath;
+        try {
+            p = Runtime.getRuntime().exec(co);
+            inputStreamReader = new InputStreamReader(p.getInputStream());
+            br = new BufferedReader(inputStreamReader);
+            System.out.println("执行删除任务完毕 删除命令:{} 时间:{}");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }finally {
+            br.close();
         }
     }
 //    public static void main(String[] args) {

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/VerifyMapper.xml

@@ -133,7 +133,7 @@
         stage,
         target_info,
         `status`,
-        type,
+        `type`,
         submit_time,
         verify_time,
         verify_unit_id,
@@ -145,5 +145,40 @@
     </select>
 
 
+    <select id="getOnes" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify">
+        select
+        sequence_nbr,
+        project_id,
+        code,
+        stage,
+        target_info,
+        status,
+        `type`,
+        submit_time,
+        verify_time,
+        verify_unit_id,
+        charger_person_id,
+        inspector_id,
+        rec_date,
+        rec_user_id,
+        rec_user_name,
+        is_delete,
+        task_id
+        from
+       tz_ugp_verify
+       where
+       project_id =#{projectId}
+      and verify_time =#{time}
+      <if test="code != null and code !=''">
+          and target_info -> "$.code" =#{code}
+      </if>
+        <if test="manyCode != null and manyCode !=''">
+            and target_info -> "$.code" =#{manyCode}
+        </if>
+
+
+    </select>
+
+
 
 </mapper>

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/WeldMapper.xml

@@ -26,5 +26,19 @@
         </where>
         order by rec_date desc
     </select>
+    <select id="getWeldList" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Weld">
+    SELECT * FROM tz_ugp_weld
+        <where>
+            <if test="region != '' and region != null" >
+                and tz_ugp_weld.region like concat("%", #{region},"%")
+            </if>
+            <if test="ids !=null and ids.size > 0">
+                AND  tz_ugp_weld.project_id in
+                <foreach collection="ids" item ="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 
 </mapper>

amos-boot-system-ugp/amos-boot-module-ugp-biz/pom.xml

@@ -37,6 +37,11 @@
             <artifactId>ugp-welding-evaluation-inspection-sdk</artifactId>
             <version>1.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-compiler</artifactId>
+            <version>7.10.0.Final</version>
+        </dependency>
         <!--调用python的依赖-->
         <dependency>
             <groupId>org.python</groupId>
@@ -44,8 +49,6 @@
             <version>2.7.0</version>
         </dependency>
 
-
-
     </dependencies>
     <build>
         <plugins>

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/VerifyController.java

@@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.google.common.collect.Lists;
+import com.mao.expertSystem.WeldingQualification;
+import com.mao.expertSystem.material.MyPqr;
+import com.mao.expertSystem.material.MyWps;
 import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
 import com.yeejoin.amos.boot.module.ugp.api.dto.*;
@@ -477,6 +480,27 @@ public class VerifyController extends BaseController {
 		return ResponseHelper.buildResponse(verifyServiceImpl.fixedPopovers(code));
 	}
 
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "测试", notes = "测试")
+	@GetMapping(value = "/test")
+	public ResponseModel<HashMap<String, String>> test() {
+
+		MyPqr pqr = new MyPqr();
+		pqr.setMaterial_a_class("Fe-3");
+		pqr.setMaterial_b_class("Fe-1");
+		MyWps wps = new MyWps();
+		wps.setMaterial_a_class("Fe-3");
+		wps.setMaterial_b_class("Fe-1");
+		WeldingQualification weldingQualification = new WeldingQualification();
+		HashMap<String, String> hashMap = weldingQualification.equipmentWeldingQualification(pqr, wps);
+		System.out.println(hashMap);
+		return ResponseHelper.buildResponse(hashMap);
+	}
+
+
+
 }
 
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WeldController.java

@@ -214,4 +214,20 @@ public class WeldController extends BaseController {
         return ResponseHelper.buildResponse(weldServiceImpl.getWeldQRCode(HKCode));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/getWeldList")
+    @ApiOperation(httpMethod = "GET", value = "获取焊口定位信息", notes = "获取焊口定位信息")
+    public ResponseModel<List<Weld>> getWeldList(@RequestParam( value = "region",required = false )String region){
+        return ResponseHelper.buildResponse(weldServiceImpl.getWeldList(region));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/getWeld")
+    @ApiOperation(httpMethod = "GET", value = "获取焊口定位信息", notes = "获取焊口定位信息")
+    public ResponseModel<List<Weld>> getWeld(@RequestParam( value = "region",required = false )String region){
+        return ResponseHelper.buildResponse(weldServiceImpl.list());
+    }
+
+
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java

@@ -255,6 +255,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
         //人员
         if (stage.equals(StageEnum.焊前人员.getVerifyName())) {
             verify.setStage(StageEnum.焊前人员.getStage()); //阶段
+            verify.setCode(jsonObject.getString("code"));
             //人脸
             //1.人脸识别校验
             //2.焊工资质有效期判断,查询焊工信息获取
@@ -301,9 +302,8 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
         }
         //管材
         if (stage.equals(StageEnum.焊前管材质量.getVerifyName())){
+            verify.setCode(jsonObject.getString("code"));
             //从图片中获取管材编号materialId
-
-
            //管材编号(暂时写死)
             String materialCode = "1585520415743176365";
             verify.setStage(StageEnum.焊前管材质量.getStage());
@@ -340,12 +340,13 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
         }
         //设备
         if (stage.equals(StageEnum.焊前设备.getVerifyName())){
+            verify.setCode(jsonObject.getString("code"));
             verify.setStage(StageEnum.焊前设备.getStage());
             Long weldingId = jsonObject.getLong("weldingId");
             Boolean flag =false ;
             //后面需要修改此处
             if (!ValidationUtil.isEmpty(weldingId)) {
-                ProjectResource resource = projectResourceService.getprojectResource(weldingId, null, "material");
+                ProjectResource resource = projectResourceService.getprojectResource(weldingId, null, "equipment");
                 Equipment equipment = equipmentService.getEquipment(weldingId);
                 if (!ValidationUtil.isEmpty(equipment) && !ValidationUtil.isEmpty(resource)) {
                     jsonObject.put(CheckEnum.有效.getKey(),CheckEnum.有效.getName());
@@ -650,11 +651,13 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
         qualityProblem.setGenerateStage(stage);
         qualityProblem.setProblemDescribe(stage+"不通过");
         //获取智能监检表id(项目id和检验时间)
-        LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Verify::getVerifyTime,verify.getVerifyTime())
-                .eq(Verify::getProjectId,verify.getProjectId());
-        Verify verify1 = verifyMapper.selectOne(wrapper);
-        Long sequenceNbr = verify1.getSequenceNbr( );
+        Verify verify2=null;
+        if (ValidationUtil.isEmpty(jsonObject.getString("manyCode"))) {
+             verify2 = verifyMapper.getOnes(verify.getProjectId(), verify.getVerifyTime().toLocaleString(), jsonObject.getString("code"), null);
+        } else {
+            verify2 = verifyMapper.getOnes(verify.getProjectId(), verify.getVerifyTime().toLocaleString(), null, jsonObject.getString("manyCode"));
+        }
+        Long sequenceNbr = verify2.getSequenceNbr( );
         qualityProblem.setStageVerifyId(sequenceNbr);
         qualityProblemService.save(qualityProblem);
         problemInitiationService.start(qualityProblem);

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WeldServiceImpl.java

@@ -33,6 +33,7 @@ import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
+import org.thymeleaf.expression.Ids;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -203,7 +204,7 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
             weld.setProjectId(Long.valueOf(project.getSequenceNbr()));
             weld.setInstallCompany(project.getInstallationUnitId());
             weld.setCode(code);
-            weld.setRegion(project.getInstallRegion());
+            weld.setRegion(project.getInstallRegionCode());
             weld.setCodingMethod(WeldMethodEnum.自动赋码.getState());
             weld.setCodingStatus(WeldCodeEnum.已赋值.getState());
             weld.setCodingDate(new Date());
@@ -355,5 +356,18 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
         page.setRecords(list);
         return page;
     }
+    /**
+     * 获取焊口定位信息
+     */
+    public List<Weld> getWeldList(String region){
+        List<Project> projectList = projectResourceService.getProjectList();
+        Set<String> ids = new HashSet<>();
+        for (Project project : projectList) {
+            ids.add(String.valueOf(project.getSequenceNbr()));
+        }
+        List<Weld> weldList = weldMapper.getWeldList(region,ids);
+        return weldList;
+    }
+
 
 }
\ No newline at end of file