同步16迭代部分修改代码

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -227,7 +227,7 @@ public interface EquipFeignClient {
     ResponseModel<Map<String, Object>>  getDetailsById(@RequestParam Long alamId,
                                                        @RequestParam(required = false) Long equipId,
                                                        @RequestParam(required = false) String type,
-                                                       @RequestParam String area) ;
+                                                       @RequestParam(required = false) String area) ;
     /**
      *
      *获取视频列表

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/ESCar.java

@@ -18,7 +18,6 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
 @Accessors(chain = true)
 @Document(indexName = "jcs", type = "car", shards = 1, replicas = 0)
 public class ESCar {
-
     @Id
     private String id;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -12,6 +12,7 @@ import com.google.common.collect.Lists;
 import com.sun.xml.bind.v2.TODO;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.rule.action.MessageAction;
 import com.yeejoin.amos.boot.biz.common.dto.PermissionModelDto;
 import com.yeejoin.amos.boot.biz.common.enums.HomePageEnum;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
@@ -45,6 +46,8 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -175,6 +178,8 @@ public class CommandController extends BaseController {
     AirportStandMapper airportStandMapper;
     private static final String JW = "mechinePosition";
     private static final String KEYSITE = "keySiteExcle";
+    public static final Logger log = LoggerFactory.getLogger(CommandController.class);
+
 
     private OrgUsrMapper orgUsrMapper;
 
@@ -444,7 +449,7 @@ public class CommandController extends BaseController {
         }
         ResponseModel<Page<Map<String, Object>>> data = null;
         if (ValidationUtil.isEmpty(par.getLatitudeTwo()) ){
-            data =  equipFeignClient.getVideopag(pageNum == 1 ? "0" : String.valueOf(pageNum * pageSize), pageSize.toString(),par.getBuildingId(),par.getCode(),null,par.getBizOrgCode(),par.getType());
+            data =  equipFeignClient.getVideopag( String.valueOf((pageNum - 1) * pageSize), pageSize.toString(),par.getBuildingId(),par.getCode(),null,par.getBizOrgCode(),par.getType());
         }else {
             data = equipFeignClient.pageVideoByAlertType( pageNum, pageSize, par);
         }
@@ -1837,12 +1842,13 @@ public class CommandController extends BaseController {
             Date date1=  new Date();
             esCar.setId(UUID.randomUUID().toString().trim().replaceAll("-",""));
             esCar.setTime(date1.getTime());
+            Gps gps = PositionUtil.gcj02_To_Gps84(Double.valueOf(esCar.getLatitude()), Double.valueOf(esCar.getLongitude()));
+            esCar.setLongitude(String.valueOf(gps.getWgLon()));
+            esCar.setLatitude(String.valueOf(gps.getWgLat()));
             esCarService.saveESCar(esCar);
             //给App端发送
             // TODO
 
-            //给WEB端发送  前端传递的为高德经纬度 需转换为WGS84
-            Gps gps = PositionUtil.gcj02_To_Gps84(Double.valueOf(esCar.getLatitude()), Double.valueOf(esCar.getLongitude()));
 //            esCar.setLatitude(String.valueOf(gps.getWgLat()));
 //            esCar.setLongitude(String.valueOf(gps.getWgLon()));
 
@@ -1871,6 +1877,7 @@ public class CommandController extends BaseController {
                 });
 
                 emqKeeper.getMqttClient().publish(topic,JSONObject.toJSONString(result.get(0)).getBytes(), RuleConfig.DEFAULT_QOS, false);
+                log.info(String.format("消息推送成功,数据: %s", JSON.toJSONString(result.get(0))));
             }
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferCompanyResourcesServiceImpl.java

@@ -123,6 +123,7 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
             JcSituationDetail jcSituationDetail = new JcSituationDetail();
             jcSituationDetail.setAlertCalledId(alertCalledId);
             jcSituationDetail.setInfoType("车辆反馈");
+
             jcSituationDetail.setInfo(info);
             if (CollectionUtils.isNotEmpty(photos)){
                 jcSituationDetail.setInfo(info+"/photos:"+Joiner.on(",").join(photos));

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3511,5 +3511,17 @@
 
 
 
+    <changeSet author="chenzhao" id="20220909-cz-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_data_dictionary" columnName="extend"/>
+            </not>
+        </preConditions>
+        <comment>modify table cb_data_dictionary add columns  extend</comment>
+        <sql>
+            ALTER TABLE `cb_data_dictionary` add column `extend` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '扩展列';
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>