mq -fix

common/common-core/src/main/resources/mapper/SysStruMapper.xml

@@ -117,10 +117,10 @@
 
 
     <select id="getStruByChildId" resultType="com.hdkj.lt.core.sys.model.po.SysStru">
-        SELECT su.stru_Id    struId,
+        SELECT su.dept_id    struId,
                su.stru_type  struType,
                sn.short_name name
-        from SYS_STRU su
+        from sys_dept su
                  left join SYS_ORGAN sn on su.ORGAN_ID = sn.ORGAN_ID
         where su.stru_id = (select p.parent_id from SYS_STRU p where p.stru_id = #{struId} and p.DEL_FLAG = '0') and su.DEL_FLAG = '0'
     </select>
@@ -137,11 +137,11 @@
     </select>
 
     <select id="getCountyByPsrId" resultType="com.hdkj.lt.core.sys.model.dto.OrgInfoDto">
-        select t.STRU_ID struId,
-               t.ORGAN_ALIAS organName
+        select t.dept_id struId,
+               t.dept_name organName
         from dwd_shb_ds_feeder_base b
-                 left join SYS_STRU t
-                           on t.ISC_ORG_ID = b.maint_org
+                 left join sys_dept t
+                           on t.isc_org_id = b.maint_org
         where b.psr_id = #{psrId}
     </select>
 

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/controller/AcceptPlanPowerCutController.java

@@ -49,8 +49,8 @@ public class AcceptPlanPowerCutController {
      **/
     @PostMapping("/acceptPlanPowerCut")
     @ApiOperation(value = "接收计划停电数据")
-    public ApiResponse<Boolean> acceptPlanPowerCut(@RequestBody AcceptPlanPowerCutDTO AcceptPlanPowerCutDTO) {
-        boolean result = acceptPlanPowerCutService.acceptPlanPowerCut(AcceptPlanPowerCutDTO);
+    public ApiResponse<Boolean> acceptPlanPowerCut(@RequestBody AcceptPlanPowerCutDTO acceptPlanPowerCutDTO) {
+        boolean result = acceptPlanPowerCutService.acceptPlanPowerCut(acceptPlanPowerCutDTO);
         return ApiResponse.success(result);
     }
 

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/entity/dto/AcceptPlanPowerCutDTO.java

@@ -38,14 +38,16 @@ public class AcceptPlanPowerCutDTO implements Serializable {
     @ApiModelProperty(value = "计划状态")
     private String planStatus;
     //计划开始时间
-    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+
+   // @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "计划开始时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
     //计划结束时间
-    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+
+   // @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "计划结束时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
     //计划停电的馈线列表
     @ApiModelProperty(value = "计划停电的馈线列表")