diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderDomain.java index 8240b2d8..b9ed8f56 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderDomain.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderDomain.java @@ -124,5 +124,7 @@ public class XhpcWorkOrderDomain implements Serializable { private List replyImgList; + private Integer measure; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityDiscountServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityDiscountServiceImpl.java index 81a63f19..9ee79950 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityDiscountServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityDiscountServiceImpl.java @@ -5,6 +5,7 @@ import com.xhpc.activity.domain.XhpcActivityTemplateDomain; import com.xhpc.activity.mapper.XhpcActivityDiscountMapper; import com.xhpc.activity.mapper.XhpcActivityTemplateMapper; import com.xhpc.activity.service.XhpcActivityDiscountService; +import com.xhpc.activity.utils.AreaCodeUtil; import com.xhpc.common.core.exception.CustomException; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.service.BaseService; @@ -55,13 +56,17 @@ public class XhpcActivityDiscountServiceImpl extends BaseService implements Xhpc if(templateDomain == null){ throw new CustomException("折扣模版不存在"); } + domain.setStationList(AreaCodeUtil.removeAreaCode(domain.getStationList())); discountMapper.insert(domain); return true; } + + @Override public boolean updateDomain(XhpcActivityDiscountDomain domain){ + domain.setStationList(AreaCodeUtil.removeAreaCode(domain.getStationList())); return discountMapper.updateByPrimaryKey(domain) > 0; } diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java index 075f9bf1..a8ce03cb 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java @@ -5,6 +5,7 @@ import com.xhpc.activity.domain.XhpcActivityInternetDomain; import com.xhpc.activity.mapper.XhpcActivityFormulaMapper; import com.xhpc.activity.mapper.XhpcActivityInternetMapper; import com.xhpc.activity.service.XhpcActivityInternetService; +import com.xhpc.activity.utils.AreaCodeUtil; import com.xhpc.common.core.exception.CustomException; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.util.DateUtil; @@ -54,6 +55,7 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ @Override public boolean insertDomain(XhpcActivityInternetDomain domain) { + domain.setStationList(AreaCodeUtil.removeAreaCode(domain.getStationList())); internetMapper.insert(domain); List formulaDomainList = getFormulaFullList(domain); @@ -64,6 +66,7 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ @Override public boolean updateDomain(XhpcActivityInternetDomain domain) { + domain.setStationList(AreaCodeUtil.removeAreaCode(domain.getStationList())); internetMapper.updateByPrimaryKey(domain); formulaMapper.deleteByActivityId(domain.getActivityId()); diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/AutoProcessOrderTask.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/AutoProcessOrderTask.java index 59230c59..970bbca3 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/AutoProcessOrderTask.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/AutoProcessOrderTask.java @@ -2,9 +2,7 @@ package com.xhpc.activity.task; import com.xhpc.activity.domain.XhpcWorkOrderDomain; -import com.xhpc.activity.domain.XhpcWorkTypeDictDomain; import com.xhpc.activity.mapper.XhpcWorkOrderMapper; -import com.xhpc.activity.mapper.XhpcWorkTypeDictMapper; import com.xhpc.common.api.PowerPileService; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.StringUtils; @@ -26,9 +24,6 @@ public class AutoProcessOrderTask { @Resource XhpcWorkOrderMapper workOrderMapper; - @Resource - XhpcWorkTypeDictMapper typeDictMapper; - @Resource PowerPileService powerPileService; @@ -41,10 +36,9 @@ public class AutoProcessOrderTask { if (StringUtils.isEmpty(pileNo) || pileNo.length() < 14) continue; pileNo = pileNo.substring(0, 14); - XhpcWorkTypeDictDomain typeDictDomain = typeDictMapper.selectByPrimaryKey(orderDomain.getType()); String processStr = ""; R r = null; - switch (typeDictDomain.getMeasure()) { + switch (orderDomain.getMeasure()) { case 1: // 自动升级 r = powerPileService.pileSoftwareUpgrade(pileNo); processStr = "自动升级指令"; diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java index 30d0fecd..4f24d04c 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java @@ -10,6 +10,9 @@ import com.xhpc.common.core.utils.bean.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.ArrayList; @@ -17,6 +20,8 @@ import java.util.List; @Component +@RestController +@RequestMapping("/clearing/order") public class SyncHistoryOrderTask { @@ -32,6 +37,7 @@ public class SyncHistoryOrderTask { */ @Scheduled(cron = "0 0 0/1 * * ?") @Transactional + @GetMapping("/syncTask") void ExpiredTenantStatusTask() { System.out.println(" ============== 自动同步订单到清分 开始 =========================="); diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/utils/AreaCodeUtil.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/utils/AreaCodeUtil.java new file mode 100644 index 00000000..cb40263d --- /dev/null +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/utils/AreaCodeUtil.java @@ -0,0 +1,22 @@ +package com.xhpc.activity.utils; + + +import cn.hutool.core.util.StrUtil; + +public class AreaCodeUtil { + + public static String removeAreaCode(String stationIds){ + String shen = "Shen"; + String shi = "Shi"; + String qu = "Qu"; + String[] stationList = stationIds.split(","); + StringBuilder newIds = new StringBuilder(); + for(String stationId: stationList){ + if(!stationId.contains(shen) && !stationId.contains(shi) && !stationId.contains(qu)){ + newIds.append(stationId).append(","); + } + } + + return StrUtil.sub(newIds.toString(),0, -1); + } +} diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml index 0d001888..58a34e31 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml @@ -306,7 +306,7 @@