Merge branch 'develop_dl' into develop_dl_bugfix

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -518,6 +518,15 @@ public class EquipmentSpecificController extends AbstractBaseController {
         return CommonResponseUtil.success();
     }
 
+    @GetMapping("/change/status/car")
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "修改车辆二维码", notes = "修改车辆二维码")
+    public ResponseModel changeCarStatusById(@RequestParam(value = "status") String status,
+                                             @RequestParam(value = "carId") String carId) {
+        equipmentSpecificSerivce.updateCarStatus(status, carId);
+        return CommonResponseUtil.success();
+    }
+
     @GetMapping("/find/id")
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "查询泡沫系统指标", notes = "查询装备id")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -294,6 +294,8 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     void updateWaterResourceStatus(@Param("id") Long id, @Param("status") String status);
 
+    Integer updateCarStatus(@Param("id") String id, @Param("status") String status);
+
     String updateEquipSpecificStatusByCheckInput(String id);
 
     Page<Map<String,Object>> selectListByPatrolCheck(Page<Map<String,Object>> page, String id);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificSerivce.java

@@ -328,4 +328,5 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
 
     Page<Map<String, Object>> getFireEquipListByDefineCode(String code, String equipStatus, String bizOrgCode, Page<Map<String, Object>> pageBean);
 
+    void updateCarStatus(String status, String carId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -2215,6 +2215,12 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         }
     }
 
+
+    @Override
+    public void updateCarStatus(String status, String carId) {
+        equipmentSpecificMapper.updateCarStatus(carId, status);
+    }
+
     @Override
     public String updateEquipSpecificStatusByCheckInput(String id) {
         return equipmentSpecificMapper.updateEquipSpecificStatusByCheckInput(id);

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -2429,6 +2429,10 @@
         update cb_water_resource set water_status = #{status} where equip_id = #{id}
     </update>
 
+    <update id="updateCarStatus">
+        update wl_car set equip_status = #{status} where id = #{id}
+    </update>
+
     <select id="getEquipStatusList" resultType="java.lang.String">
         SELECT
             wles.equip_status AS equipStatus