no message

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

@@ -121,4 +121,8 @@ public class WeldDto  extends BaseDto {
   */
  private String equipmentCode;
 
+/**修复标注*/
+ private Integer repairMark;
+ private String binding;
+
 }

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

@@ -100,5 +100,13 @@ public class Weld extends BaseEntity {
     @TableField("voltage_latitude")
     private String voltageLatitude;
 
+    @TableField("repair_mark")
+    private Integer repairMark;
+
+
+    @TableField("binding")
+    private String binding;
+
+
 
 }

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

@@ -31,5 +31,6 @@ public interface EquipmentMapper extends BaseMapper<Equipment> {
 
 
     Page<Map<String,Object>> getEqChangeList(IPage<Map<String, Object>> page,@Param("projectId") String projectId);
+    Map<String,Object> getEqDetailData(@Param("id")String id);
 
 }

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

@@ -34,4 +34,6 @@ public interface WeldMapper extends BaseMapper<Weld> {
 
     List<Weld> getWeldList(String region,@Param("ids")Set<String> ids);
 
+    List<Weld> getWeldListRepir(Long projectId, @Param("weldCodes")List<String> weldCodes);
+
 }

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

@@ -77,8 +77,21 @@
     <select id="getEqChangeList" resultType="java.util.Map">
 
         SELECT
-            te.*,
-            tm.info
+            te.sequence_nbr AS sequenceNbr,
+            te.name AS name,
+            te.company_id AS companyId,
+            te.code AS  code,
+            te.type AS type,
+            te.manufacturer AS  manufacturer,
+            te.manufacture_date AS  manufactureDate,
+            te.service_life AS serviceLife,
+            te.verify_status AS verifyStatus,
+            te.inspection_date AS inspectionDate,
+            te.use_status AS useStatus,
+            te.remark AS remark,
+            te.org_code AS orgCode,
+            te.rec_date AS recDate,
+            tm.info AS info
         FROM
             tz_ugp_equipment te
                 LEFT JOIN tz_ugp_attachment tm ON te.sequence_nbr = tm.source_id
@@ -90,4 +103,18 @@
     </select>
 
 
+    <select id="getEqDetailData" resultType="java.util.Map">
+
+        SELECT
+            eq.*,
+            tm.info AS info
+        FROM
+            tz_ugp_equipment eq
+                LEFT JOIN tz_ugp_attachment tm
+            ON eq.sequence_nbr = tm.source_id  AND tm.type = 'enuipment'
+        WHERE
+            eq.sequence_nbr = #{id}
+    </select>
+
+
 </mapper>

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

@@ -39,8 +39,24 @@
     <select id="getMterChangeList" resultType="java.util.Map">
 
         SELECT
-            te.*,
-            tm.info
+            te.sequence_nbr AS sequenceNbr,
+            te.name AS  name,
+            te.company_id AS  companyId,
+            te.code AS code,
+            te.type AS type,
+            te.spec AS  spec,
+            te.wall_thickness AS wallThickness,
+            te.manufacturer AS manufacturer,
+            te.manufacture_date AS  manufactureDate,
+            te.batch_num AS  batchNum,
+            te.diameter AS diameter,
+            te.material AS material,
+            te.length AS length,
+            te.manufacture_addr AS manufactureAddr,
+            te.approved AS approved,
+            te.org_code AS orgCode,
+            te.rec_date AS recDate,
+            tm.info AS info
         FROM
             tz_ugp_material te
                 LEFT JOIN tz_ugp_attachment tm ON te.sequence_nbr = tm.source_id

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

@@ -41,4 +41,15 @@
         </where>
     </select>
 
+
+
+    <select id="getWeldListRepir" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Weld">
+        SELECT * from tz_ugp_weld where
+            code IN
+                <foreach collection="weldCodes" item ="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            and project_id =#{projectId}
+    </select>
+
 </mapper>

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

@@ -326,6 +326,13 @@ public class EquipmentController extends BaseController {
 		return ResponseHelper.buildResponse(equipmentServiceImpl.getEqChangeList(projectId,current,size));
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "设备附件详情", notes = "设备附件详情")
+	@GetMapping(value = "/getEqDetailData/{sequenceNbr}")
+	public ResponseModel<Object> getEqDetailData(@PathVariable String sequenceNbr) {
+		return ResponseHelper.buildResponse(equipmentServiceImpl.getEqDetailData(sequenceNbr));
+	}
+
 
 
 }

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

@@ -265,5 +265,12 @@ public class WeldController extends BaseController {
     public ResponseModel<List<ProjectDto>> getWeldListByLocation(@RequestBody Object obj,boolean isCraft){
         return ResponseHelper.buildResponse(weldServiceImpl.getWeldListByLocation(obj,isCraft));
     }
+    /**焊口修复标识更新*/
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PostMapping(value = "/updateWeldRepairMark")
+    @ApiOperation(httpMethod = "POST", value = "焊口修复标识更新", notes = "焊口修复标识更新")
+    public ResponseModel<List<Map<String, String>>> updateWeldRepairMark(@RequestParam("projectId") String projectId,  @RequestBody List<String> weldCode){
+        return ResponseHelper.buildResponse(weldServiceImpl.updateWeldRepairMark(projectId,weldCode));
+    }
 
 }

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

@@ -322,4 +322,12 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
         return eqChangeList;
     }
 
+    public Map<String, Object> getEqDetailData(String sequenceNbr) {
+
+        Map<String, Object> eqDetailData = equipmentMapper.getEqDetailData(sequenceNbr);
+        String o = (String)eqDetailData.get("info");
+       //因为
+
+        return null;
+    }
 }
\ No newline at end of file

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

@@ -515,4 +515,38 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
         return projectDtos;
     }
 
+   // 修复标识 2-重焊 1-切除  3-重焊和切除
+    public List<Map<String, String>> updateWeldRepairMark(String projectId, List<String> weldCodes) {
+        List<Map<String, String>> lists = new ArrayList();
+        List<Weld> weldList = weldMapper.getWeldListRepir(Long.valueOf(projectId),weldCodes);
+        LambdaQueryWrapper<Weld> wrapper = new LambdaQueryWrapper<>();
+        Weld weld1 = new Weld();
+        weldList.forEach(e->{
+            Map<String, String> maps = new HashMap<>();
+            wrapper.eq(Weld::getProjectId,projectId)
+                    .eq(Weld::getCode,e.getCode());
+            if (!ValidationUtil.isEmpty(e.getRepairMark())) {
+                if (e.getRepairMark()==2) {
+                    //重焊过了
+                    weld1.setRepairMark(3);
+                    maps.put(e.getCode(),"ok");
+                    lists.add(maps);
+                }else if (e.getRepairMark()==1){
+                    //切除过了
+                    maps.put(e.getCode(),"切除过了,不能在切除了");
+                    lists.add(maps);
+                }else if (e.getRepairMark()==3){
+                    // 重焊,切除过了
+                   maps.put(e.getCode(),"已经重焊.切除过了,不能在切除了");
+                   lists.add(maps);
+                }
+            }else {
+                weld1.setRepairMark(1);
+                maps.put(e.getCode(),"ok");
+                lists.add(maps);
+            }
+           weldMapper.update(weld1, wrapper);
+        });
+        return lists;
+    }
 }
\ No newline at end of file

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

 #DB properties:
-spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://36.46.137.116:5432/per_tzs_amos_tzs_biz?currentSchema=amos_ugp_biz
+spring.datasource.driver-class-name=cn.com.vastbase.Driver
+spring.datasource.url=jdbc:vastbase://36.46.137.116:5432/per_tzs_amos_tzs_biz?currentSchema=amos_ugp_biz
 spring.datasource.username=admin
 spring.datasource.password=Yeejoin@2023
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
@@ -19,15 +19,15 @@ spring.datasource.hikari.connection-test-query=SELECT 1
 eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.lease-expiration-duration-in-seconds=10
 eureka.instance.lease-renewal-interval-in-seconds=5
-eureka.client.service-url.defaultZone =http://admin:a1234560@172.16.10.220:10001/eureka/
-eureka.instance.health-check-url=http://172.16.3.34:${server.port}${server.servlet.context-path}/actuator/health
+eureka.client.service-url.defaultZone =http://admin:a1234560@172.16.10.210:10001/eureka/
+eureka.instance.health-check-url=http://localhost:${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.3.34:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.3.34:${server.port}${server.servlet.context-path}/doc.html
+eureka.instance.status-page-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.ip-address=172.16.3.34
+eureka.instance.ip-address=localhost
 eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
 
 #eureka.client.registry-fetch-interval-seconds=5
@@ -46,7 +46,7 @@ eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
 spring.redis.database=1
 #spring.redis.host=39.98.45.134
 #spring.redis.host=172.16.10.90
-spring.redis.host=172.16.10.220
+spring.redis.host=172.16.10.210
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
@@ -58,7 +58,7 @@ spring.redis.expire.time=300
 ## emqx properties:
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.10.220:1883
+emqx.broker=tcp://172.16.10.210:1883
 emqx.user-name=admin
 emqx.password=public
 

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

 #DB properties:
 spring.datasource.driver-class-name=cn.com.vastbase.Driver
-spring.datasource.url=jdbc:vastbase://36.46.137.116:5432/per_tzs_amos_tzs_biz?currentSchema=amos_ugp_biz
-spring.datasource.username=admin
+spring.datasource.url=jdbc:vastbase://36.46.137.116:5432/tzs_amos_ugp_biz?currentSchema=amos_ugp_biz
+spring.datasource.username=cpp
 spring.datasource.password=Yeejoin@2023
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.minimum-idle=5
@@ -13,19 +13,21 @@ spring.datasource.hikari.max-lifetime=1800000
 spring.datasource.hikari.connection-timeout=30000
 spring.datasource.hikari.connection-test-query=SELECT 1
 
+
+
 ##eureka properties:
 eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.lease-expiration-duration-in-seconds=10
 eureka.instance.lease-renewal-interval-in-seconds=5
-eureka.client.service-url.defaultZone =http://admin:a1234560@172.16.10.210:10001/eureka/
-eureka.instance.health-check-url=http://172.16.3.34:${server.port}${server.servlet.context-path}/actuator/health
+eureka.client.service-url.defaultZone =http://admin:a1234560@172.16.8.12:10001/eureka/
+eureka.instance.health-check-url=http://192.168.1.113:${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.3.34:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.3.34:${server.port}${server.servlet.context-path}/doc.html
+eureka.instance.status-page-url=http://192.168.1.113:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://192.168.1.113:${server.port}${server.servlet.context-path}/doc.html
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.ip-address=172.16.3.34
+eureka.instance.ip-address=192.168.1.113
 eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
 
 #eureka.client.registry-fetch-interval-seconds=5
@@ -44,7 +46,7 @@ eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
 spring.redis.database=1
 #spring.redis.host=39.98.45.134
 #spring.redis.host=172.16.10.90
-spring.redis.host=172.16.10.210
+spring.redis.host=172.16.8.12
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
@@ -56,7 +58,7 @@ spring.redis.expire.time=300
 ## emqx properties:
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.10.210:1883
+emqx.broker=tcp://172.16.8.12:1883
 emqx.user-name=admin
 emqx.password=public
 

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

-spring.application.name=UGP
+spring.application.name=UGP-cpp
 server.servlet.context-path=/ugp
 server.port=12000
 spring.profiles.active=vb