diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java index 11a24054..d056ea59 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java @@ -131,15 +131,18 @@ public class NotificationChargeOrderInfo4BonusTask extends CoreDispatcher { OrderMappingRepository orderMappingRepository, String operatorId) { EtOrderMapping etOrderMapping; - EtOrderMapping om = new EtOrderMapping(); + EtOrderMapping om; if (internetSerialNumber != null) { + om = new EtOrderMapping(); om.setEvcsOrderNo(internetSerialNumber); Example example = Example.of(om); etOrderMapping = orderMappingRepository.findOne(example).orElse(null); if (etOrderMapping == null) { + om.setXhOrderNo(xhOrderNo); etOrderMapping = orderMappingRepository.save(om); } } else { + om = new EtOrderMapping(); om.setXhOrderNo(xhOrderNo); Example example = Example.of(om); etOrderMapping = orderMappingRepository.findOne(example).orElse(null); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/annotation/NoRepeatSubmit.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/annotation/NoRepeatSubmit.java new file mode 100644 index 00000000..697fb04b --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/annotation/NoRepeatSubmit.java @@ -0,0 +1,19 @@ +package com.xhpc.common.core.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface NoRepeatSubmit { + + /* + * 防止重复提交标记注解 + * 设置请求锁定时间 + * @return + */ + int lockTime() default 10; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/controller/BaseController.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/controller/BaseController.java index 1f6bd1da..6b5473b4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/controller/BaseController.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/controller/BaseController.java @@ -59,7 +59,19 @@ public class BaseController PageHelper.startPage(pageNum, pageSize, orderBy); } } + /** + * 设置请求分页数据 + */ + protected void startPage(Integer pageNum,Integer pageSize) + { + PageDomain pageDomain = TableSupport.buildPageRequest(); + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) + { + String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); + PageHelper.startPage(pageNum, pageSize, orderBy); + } + } /** * 响应请求分页数据 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/service/BaseService.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/service/BaseService.java new file mode 100644 index 00000000..f205e37b --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/service/BaseService.java @@ -0,0 +1,27 @@ +package com.xhpc.common.core.web.service; + +import com.github.pagehelper.PageHelper; +import com.xhpc.common.core.utils.StringUtils; +import com.xhpc.common.core.utils.sql.SqlUtil; +import com.xhpc.common.core.web.page.PageDomain; +import com.xhpc.common.core.web.page.TableSupport; + +/** + * @author yuyang + * @date 2022/1/12 10:54 + */ +public class BaseService { + + protected void startPage() + { + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) + { + String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); + PageHelper.startPage(pageNum, pageSize, orderBy); + } + } + +} diff --git a/sql/test-opsecret.sql b/sql/test-opsecret.sql new file mode 100644 index 00000000..b707aaa1 --- /dev/null +++ b/sql/test-opsecret.sql @@ -0,0 +1,24 @@ +INSERT INTO `ry-cloud`.et_auth_sec_token (name, operator_id, operator_id3irdpty, secret_token_type, token, token_expiry, + data_secret, data_secretiv, operator_secret, sig_secret, encrypt, url_prefix, + last_push_order, tenant_id) +VALUES ('成都市平台', 'MA6DFCTD5', '765367656', 'IN', NULL, NULL, '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', + 'wAeYIVQUwd0iGZsV', 1, 'http://hlht.cd-test.zcsy-inc.cn/evcs/20160701', NULL, '000000'), + (NULL, 'MA6DFCTD5', '765367656', 'OUT', NULL, NULL, + '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', 'wAeYIVQUwd0iGZsV', 1, + 'http://hlht.cd-test.zcsy-inc.cn/evcs/20160701', INTENDED, '000000'), + ('恒大', 'MA6DFCTD5', 'MA5FF58R7', 'IN', NULL, NULL, '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', + 'wAeYIVQUwd0iGZsV', 1, 'http://119.23.185.48:9268/evcs/v1/', NULL, '000000'), + (NULL, 'MA6DFCTD5', 'MA5FF58R7', 'OUT', NULL, NULL, '134714FB204A2CD1', '134707EDE37275E7', 'B8E66A501605A3C0', + '218A622D09620801', 1, 'http://119.23.185.48:9268/evcs/v1/', NULL, '000000'), + ('快电', 'MA6DFCTD5', 'MA005DBW1', 'IN', NULL, NULL, '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', + 'wAeYIVQUwd0iGZsV', 1, 'https://dev-charge-hub-ws-qq.gokuaidian.com/evcs/v1.0/', NULL, '000000'), + (NULL, 'MA6DFCTD5', 'MA005DBW1', 'OUT', NULL, NULL, '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', + 'wAeYIVQUwd0iGZsV', 1, 'https://dev-charge-hub-ws-qq.gokuaidian.com/evcs/v1.0/', NULL, '000000'), + ('新电途', 'MA6DFCTD5', 'MA25CNM38', 'IN', NULL, NULL, '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', + 'wAeYIVQUwd0iGZsV', 1, 'https://test.evshine.net/icnin/evcs/v1.1/', NULL, '000000'), + (NULL, 'MA6DFCTD5', 'MA25CNM38', 'OUT', NULL, NULL, 'ojs67l46z3f7rhok', 'tet9swfkyojkhaos', '4t8jr80mrjjt2y7f', + '75ghv1ie1zzex31s', 1, 'https://test.evshine.net/icnin/evcs/v1.1/', NULL, '000000'), + ('小桔', 'MA6DFCTD5', '101437000', 'IN', NULL, NULL, '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', + 'wAeYIVQUwd0iGZsV', 1, 'http://opendev.xiaojukeji.com/operatorplatform/', NULL, '000000'), + (NULL, 'MA6DFCTD5', '101437000', 'OUT', NULL, NULL, '618c8e506e798acf', 'ea0e7e1b8fb8a935', '7751a50aa41683f0', + '7b3b03fe94654e3b', 1, 'http://opendev.xiaojukeji.com/operatorplatform/', NULL, '000000'); diff --git a/sql/v2.1.sql b/sql/v2.1.sql index a1ce2890..3fbc485c 100644 --- a/sql/v2.1.sql +++ b/sql/v2.1.sql @@ -241,7 +241,7 @@ CREATE TABLE `xhpc_device_message` `type` varchar(50) DEFAULT NULL COMMENT '设备类型（PILE-充电桩，TERMINAL-终端）', `serial_number` varchar(32) DEFAULT NULL COMMENT '设备流水号', `content` text CHARACTER SET utf8 COMMENT '报文16进制原文', - `reply_content` text COMMENT '回复的报文', + `charge_order_no` varchar(50) default null COMMENT '充电订单号', `status` int(10) DEFAULT '0' COMMENT '状态（0正常 1停用）', `create_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', `create_by` varchar(30) CHARACTER SET utf8 DEFAULT NULL COMMENT '创建者', diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java index 6e908c0c..6d783c28 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java @@ -38,8 +38,6 @@ public class XhpcChargingPileController extends BaseController { */ @GetMapping("/list") public TableDataInfo list(HttpServletRequest request,String name, Integer type, String serialNumber, Long chargingStationId) { - - startPage(); List> list = xhpcChargingPileService.selectXhpcChargingPileList(request,name, type, serialNumber, chargingStationId); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java index a7d2f176..39c08b04 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java @@ -71,7 +71,6 @@ public class XhpcChargingStationController extends BaseController { //@PreAuthorize(hasPermi = "system:station:list") @GetMapping("/list") public TableDataInfo list(HttpServletRequest request,String name, String operatorName) { - startPage(); List> list = xhpcChargingStationService.selectXhpcChargingStationList(request,name, operatorName); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java index f498ed7b..e46c38ff 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java @@ -39,8 +39,6 @@ public class XhpcTerminalController extends BaseController { //@PreAuthorize(hasPermi = "system:station:list") @GetMapping("/list") public TableDataInfo list(HttpServletRequest request, String serialNumber, Integer type, Integer status, String workStatus, Long chargingStationId) { - - startPage(); List> list = xhpcTerminalService.getXhpcTerminalList(request,serialNumber, type, status, workStatus, chargingStationId); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java index 0515f0e5..d3457f96 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java @@ -21,7 +21,7 @@ public interface IXhpcChargingPileService { * @param name 桩名称 * @return */ - List> selectXhpcChargingPileList(HttpServletRequest request, String name, Integer type, String serialNumber, Long chargingStationId); + List> selectXhpcChargingPileList(HttpServletRequest request,String name, Integer type, String serialNumber, Long chargingStationId); /** diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java index 9f0f0b6a..799351a5 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java @@ -15,6 +15,7 @@ import com.xhpc.common.core.exception.CustomException; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.domain.XhpcChargingPile; import com.xhpc.common.domain.XhpcChargingStation; import com.xhpc.common.domain.XhpcTerminal; @@ -41,7 +42,7 @@ import static com.aliyun.oss.internal.OSSConstants.URL_ENCODING; * @date 2021/7/27 14:36 */ @Service -public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService { +public class XhpcChargingPileServiceImpl extends BaseService implements IXhpcChargingPileService{ @Autowired private XhpcChargingPileMapper xhpcChargingPileMapper; @@ -92,6 +93,7 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService { Map landUser = xhpcChargingStationService.getLandUser(userId); if(landUser !=null){ if(landUser.get("userType") !=null){ + startPage(); if("01".equals(landUser.get("userType").toString())){ Long operatorId = Long.valueOf(landUser.get("operatorId").toString()); list= xhpcChargingPileMapper.selectXhpcChargingPileList(name, type, serialNumber, chargingStationId,operatorId,1,tenantId); @@ -101,10 +103,9 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService { } } }else{ + startPage(); list= xhpcChargingPileMapper.selectXhpcChargingPileList(name, type, serialNumber, chargingStationId,userId,0,tenantId); } - - return list; } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java index 856838be..c42e327d 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java @@ -12,6 +12,7 @@ import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.DateUtils; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.data.redis.CacheRateModel; import com.xhpc.common.domain.XhpcChargingStation; import com.xhpc.common.domain.XhpcRate; @@ -41,7 +42,7 @@ import java.util.regex.Pattern; * @date 2021-07-19 */ @Service -public class XhpcChargingStationServiceImpl implements IXhpcChargingStationService { +public class XhpcChargingStationServiceImpl extends BaseService implements IXhpcChargingStationService { @Autowired private XhpcChargingStationMapper xhpcChargingStationMapper; @@ -133,6 +134,7 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi Map landUser = xhpcChargingStationMapper.getLandUser(userId); if(landUser !=null){ if(landUser.get("userType") !=null){ + startPage(); if("01".equals(landUser.get("userType").toString())){ Long operatorId = Long.valueOf(landUser.get("operatorId").toString()); //运营商看自己的场站 @@ -144,6 +146,7 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi } } }else{ + startPage(); list = xhpcChargingStationMapper.selectXhpcChargingStationList(name, operatorName,userId,0,tenantId); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java index 493917d7..b8adbcb9 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java @@ -3,6 +3,7 @@ package com.xhpc.charging.station.service; import cn.hutool.core.date.DateUtil; import com.xhpc.charging.station.mapper.XhpcTerminalMapper; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.domain.XhpcTerminal; import com.xhpc.common.util.LogUserUtils; import com.xhpc.system.api.model.LoginUser; @@ -19,7 +20,7 @@ import java.util.*; * @date 2021-07-20 */ @Service -public class XhpcTerminalServiceImpl implements IXhpcTerminalService { +public class XhpcTerminalServiceImpl extends BaseService implements IXhpcTerminalService { @Autowired private XhpcTerminalMapper xhpcTerminalMapper; @@ -46,6 +47,7 @@ public class XhpcTerminalServiceImpl implements IXhpcTerminalService { @Override public List> getXhpcTerminalList(HttpServletRequest request, String serialNumber, Integer type, Integer status, String workStatus, Long chargingStationId) { LoginUser logUser = logUserUtils.getLogUser(request); + startPage(); List> list = xhpcTerminalMapper.getXhpcTerminalList(serialNumber, type, status, workStatus, chargingStationId,logUser.getTenantId()); if(list !=null && list.size()>0){ for (int i = 0; i > (8-(i+1)) & 0x0001)); + for (byte b : bytes) { + for (int i = 0; i < 8; i++) { + result.append(b >> (8 - (i + 1)) & 0x0001); } } - return result. toString(); + return result.toString(); + } + + public static final String toAscii(String hex) { + + if (hex == null) return null; + byte[] bytes = toBytes(hex); + StringBuilder sb = new StringBuilder(); + for (byte b : bytes) { + sb.append(Character.valueOf((char) b)); + } + return sb.toString(); } public static void main(String[] args) { - System.out.println(Long.valueOf(10L).toString()); +// System.out.println(Long.valueOf(10L).toString()); // System.out.println(reverseHexInt("FF00")); // byte[] data1 = toBytes(reverseHex("10270000")); // System.out.println(toInteger(data1, 0, 4)); - System.out.println(reverseHexInt("D80E")); - System.out.println(toHexInt(3800)); +// System.out.println(reverseHexInt("D80E")); +// System.out.println(toHexInt(3800)); // System.out.println(toHexInt(100000)); // System.out.println(toBits("1000")); // System.out.println(toHex(new byte[]{104, 13, 19, 123, 0, 3, 105, -123, 71, -123, -106, 50, 84, 1, 0, 72, 106, 104, // -94, 19, 124, 0, 59, 105, -123, 71, -123, -106, 50, 84, 1, 33, 9, 24, 9, 67, 57, 0, 2, 105, -123, 71, -123, -106, // 50, 84, 1, -88, 97, 43, 9, 50, 9, 21, 48, 117, 50, 9, 50, 9, 21, -64, 87, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // -40, 83, 1, 0})); - } } diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java index a2756b26..1e63467d 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java @@ -3,6 +3,8 @@ package com.xhpc.general.controller; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.general.domain.XhpcAgreement; import com.xhpc.general.service.IXhpcAgreementService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,18 +22,22 @@ public class XhpcAgreementController extends BaseController { @Autowired IXhpcAgreementService iXhpcAgreementService; + + @Log(title = "协议-删除", businessType = BusinessType.DELETE) @PostMapping("/delete") public AjaxResult delete(@RequestBody XhpcAgreement xhpcAgreement){ return iXhpcAgreementService.deleteAgreementItem(xhpcAgreement.getAgreementId()); } + @Log(title = "协议-添加", businessType = BusinessType.DELETE) @PostMapping("/add") public AjaxResult add(@RequestBody XhpcAgreement xhpcAgreement){ return iXhpcAgreementService.insertAgreementItem(xhpcAgreement.getTitle(),xhpcAgreement.getType(),xhpcAgreement.getContent()); } + @Log(title = "协议-编辑", businessType = BusinessType.UPDATE) @PostMapping("/update") public AjaxResult update(@RequestBody XhpcAgreement xhpcAgreement){ @@ -51,6 +57,7 @@ public class XhpcAgreementController extends BaseController { return AjaxResult.success(iXhpcAgreementService.selectAgreementItem(agreementId)); } + @GetMapping("/getContent") public AjaxResult getContent(@RequestParam Integer type){ diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcDictBizController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcDictBizController.java index ae6e2d50..d92d5ea2 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcDictBizController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcDictBizController.java @@ -3,6 +3,8 @@ package com.xhpc.general.controller; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.general.domain.XhpcDictionary; import com.xhpc.general.dto.XhpcDictionaryChild; import com.xhpc.general.service.IXhpcDictBizService; @@ -42,6 +44,7 @@ public class XhpcDictBizController extends BaseController { * @param sort the dictionary's sortValue * @return */ + @Log(title = "字典-添加", businessType = BusinessType.INSERT) @PostMapping("/addMainItem") public AjaxResult addMainDictionaryItem(@RequestBody XhpcDictionary xhpcDictionary){ diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcEtTokenController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcEtTokenController.java index 16360e06..96d6ded3 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcEtTokenController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcEtTokenController.java @@ -3,6 +3,8 @@ package com.xhpc.general.controller; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.general.domain.EtTokenEntity; import com.xhpc.general.service.IXhpcEtTokenService; import org.springframework.beans.factory.annotation.Autowired; @@ -28,12 +30,14 @@ public class XhpcEtTokenController extends BaseController { return getDataTable(iXhpcEtTokenService.list(operatorId, operatorId3irdpty)); } + @Log(title = "第三方token-删除", businessType = BusinessType.DELETE) @PostMapping(value = "/delete") public AjaxResult delete(@RequestBody EtTokenEntity etTokenEntity){ return iXhpcEtTokenService.delete(etTokenEntity.getId()); } + @Log(title = "第三方token-添加", businessType = BusinessType.INSERT) @PostMapping(value = "/add") public AjaxResult add(@RequestBody EtTokenEntity etTokenEntity){ diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcHelpController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcHelpController.java index a17144d5..6901de2d 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcHelpController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcHelpController.java @@ -3,6 +3,8 @@ package com.xhpc.general.controller; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.general.domain.HelpEntity; import com.xhpc.general.service.IXhpcHelpService; import org.springframework.beans.factory.annotation.Autowired; @@ -22,18 +24,22 @@ public class XhpcHelpController extends BaseController { @Autowired IXhpcHelpService iXhpcHelpService; + + @Log(title = "帮助-删除", businessType = BusinessType.DELETE) @PostMapping("/delete") public AjaxResult deleteHelpItem(@RequestBody HelpEntity helpEntity){ return iXhpcHelpService.deleteHelpItem(helpEntity.getHelpId()); } + @Log(title = "帮助-添加", businessType = BusinessType.INSERT) @PostMapping("/add") public AjaxResult insertHelpItem(@RequestBody HelpEntity helpEntity){ return iXhpcHelpService.insertHelpItem(helpEntity.getTitle(),helpEntity.getContent(),helpEntity.getType()); } + @Log(title = "帮助-修改", businessType = BusinessType.UPDATE) @PostMapping("/update") public AjaxResult updateHelpItem(@RequestBody HelpEntity helpEntity){ diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java index 80703e03..58bf8604 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java @@ -1,6 +1,8 @@ package com.xhpc.general.controller; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.general.service.IXhpcServiceDataUpdateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,6 +25,7 @@ public class XhpcServiceDataUpdateController { return AjaxResult.success(xhpcServiceDataUpdateService.list()); } + @Log(title = "小程序设置-修改", businessType = BusinessType.UPDATE) @PostMapping("/update") public AjaxResult update(@RequestParam(required = false) String SOC, @RequestParam(required = false) String version, @RequestParam(required = false) String phone, @RequestParam(required = false) String aliyunMessageCount) { diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml index 4966c1ec..533c8494 100644 --- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml +++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml @@ -19,7 +19,6 @@ - update xhpc_agreement set del_flag=1 where agreement_id=#{agreementId} diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcEtTokenMapper.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcEtTokenMapper.xml index 94ab0063..823957d3 100644 --- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcEtTokenMapper.xml +++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcEtTokenMapper.xml @@ -34,7 +34,6 @@ - delete from et_auth_sec_token where id = #{id} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java index 9d50a7f8..2894c7e2 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java @@ -38,8 +38,9 @@ public class PileLogController extends BaseController { } - @GetMapping("/{pileId}") - public TableDataInfo getPileDetailPage(@PathVariable("pileId") String pileId) { + + @GetMapping("/detail") + public TableDataInfo getPileDetailPage(@RequestParam("pileId") String pileId) { startPage(); return getDataTable(pileLogService.getPileRunLogPage(pileId)); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java index 52f3afdf..8f898d5d 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java @@ -32,15 +32,17 @@ public class StationLogController extends BaseController { } - @GetMapping("/{stationId}") - public TableDataInfo getPileDetailPage(@PathVariable("stationId") Long stationId) { + + @GetMapping("/detail") + public TableDataInfo getPileDetailPage(@RequestParam("stationId") Long stationId) { + startPage(); return getDataTable(stationLogService.getStationRatePage(stationId)); } - @GetMapping("/rate/{rateId}") - public AjaxResult getRateInfo(@PathVariable("rateId") Integer rateId) { + @GetMapping("/rate/detail") + public AjaxResult getRateInfo(@RequestParam("rateId") Integer rateId) { return AjaxResult.success(stationLogService.getRateInfo(rateId)); } } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java index 674a9108..e3a35179 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java @@ -8,18 +8,42 @@ import java.util.Date; @Data public class XhpcDeviceMessageDomain { + /** + * 消息ID + */ private Long deviceMessageId; + /** + * 设备类型 + */ private String type; + /** + * 设备编码 + */ private String serialNumber; + /** + * 充电订单号 + */ + private String chargeOrderNo; + + /** + * 报文内容 + */ private String content; - private String replyContent; - + /** + * 状态 + */ private Integer status; + /** + * 备注描述 + */ + private String remark; + + private Date createTime; private String createBy; @@ -28,5 +52,4 @@ public class XhpcDeviceMessageDomain { private String updateBy; - private String remark; } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java index 119f695f..c905bf1e 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java @@ -25,4 +25,7 @@ public interface XhpcChargingStationMapper { List> selectRateTimeListByRateId(@Param("rateId")Integer rateId); + + List> selectBaseRateTimeListByRateId(@Param("rateId")Integer rateId); + } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java index 955ee274..5d9ed7f9 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java @@ -12,5 +12,6 @@ public interface StationLogService { List> getStationRatePage(Long stationId); - List> getRateInfo(int rateId); + Map getRateInfo(int rateId); + } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java index c7f1f066..70dd33e3 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java @@ -5,6 +5,7 @@ import com.xhpc.log.service.StationLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -28,7 +29,11 @@ public class StationLogServiceImpl implements StationLogService { @Override - public List> getRateInfo(int rateId){ - return stationMapper.selectRateTimeListByRateId(rateId); + public Map getRateInfo(int rateId){ + Map resData = new HashMap<>(); + resData.put("base", stationMapper.selectBaseRateTimeListByRateId(rateId)); + resData.put("current", stationMapper.selectRateTimeListByRateId(rateId)); + + return resData; } } diff --git a/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml index ac095b69..28ca6854 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml @@ -27,7 +27,8 @@ spring: logging: level: root: info - com.xhpc.tradebill.mapper: debug + com.xhpc.log.mapper: debug + file: path: "d:\\logs" @@ -54,37 +55,3 @@ alibaba: certPath: "/www/wwwroot/scxhua.cn/xhpc-payment/appCertPublicKey.crt" publicCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayCertPublicKey_RSA2.crt" rootCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayRootCert.crt" - -###获取微信openid地址 -#WXGETJSCODE: "https://api.weixin.qq.com/sns/jscode2session?appid=wxb14ef93e9b7901f3&secret=b5c5672141b5930c30a1abee95a2dcbf&js_code=" -###阿里云身份证验证地址 -#VERIFYCARD: "http://idenauthen.market.alicloudapi.com/idenAuthentication" -##阿里云身份证验证地址appcode -#APPCODE: "APPCODE e26d9088b58e24af69411d5933cece47" -##小程序appid -#APPID: "wxd0a48e00319ef8a7" -##小程序绑定商户id -#MCHID: "1514355771" -##商户后台设置的key -#KEY: "sichuanxianghuakejiyouxiangongsi" -##微信小程序支付地址 -#WXPAYUNIFIEDORDER: "https://api.mch.weixin.qq.com/pay/unifiedorder" -##微信支付回调地址 -#SERVERDOMAIN: "http://www.scxhua.cn/prod-api/xhpc-payment/wx/paymentCallback" -##微信小程序支付地址 -#WXTRANSFERS: "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers" - -##支付宝支付回调地址 -#ALIPAYPSERVERDOMAIN: "https://www.scxhua.cn/prod-api/xhpc-payment/alipay/notifyUrl" -##支付宝公钥 -#ALIPAYPUBLICKEY: -##应用私钥 -#ALIPAYPRIVATEKEY: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCGHX1s315EKjoIBkNiF3IxCAmvtVg+TdCDL/XmJZWdcZ23tEWmmIMsLRCLUKsaPfTEhnqD6EFJnmpJu4teDImo3aDbOoO31YFEXjMXUnTTS/dtDVEo1OecsRL+Re43KSohOkIL1TMyTuNfeIglQTuhCSZ3LOEOx4OHpYwcrLp8p1ORvAS7x35nsmjLp3oQTJo9RWfzfEaKbm6cxsWLKyr5/5eGDXrUHNC5hIDLjoJbe6iqNKyIiPJHtPZfJ36PcWa7PFvx4X+Ded32KZb2AA3p9w/HX7gn1MnRfT5NGH0k3ggxLNarDU8g6JjQYgNtmE/R8gbp99BudZNfDoSF1llNAgMBAAECggEAaTa9bSoXM/bErALt3ghyx1B8+OGVpts5F5IKoVEe/PNjPfkpIzdGwONhtUnF0cKFQaAWgWE1xuGGlO2Sumevn1Cvnw1axF+1F8Om5UcE67cPFvh5kUTlpyGrutt1tMSQjpy7r7jEf1UwP3e5pzBz7TPWf2wv635OC56uOtivPJZ+8vg7VYon/mNXQuL4AavoxfSDtvo0ad30X2fK1WKeeBtgiT4UzV6ZGZh5igKQHM4lVvmbo/jOeQD0KAod7pRe/h4FBFmCVIWwgW+I+Hnzp8A/nJezoowJ3jiTt0FodC9uBCT64ZCz5dVCryD62LDVjKBxB7cfIoQA+PxCiXr9QQKBgQD+2v38J/MlfK/XCYldclzumizwIw6T0Mv6XvYwXQHYgYDKYNF6k1LhMEUo7fP3EsPdV8h/nXmdU4qadOVm6QSJ/rGEl22yGlO7woUzTY/Ls9eknoqfMYuyI1+ICMnNxmesQbWyc0cOHh44cEF+icfJxEDAmrHGLmBVsKuLUJUuVQKBgQCGt663TF7mixghiUOcT11zC1fqG+dIcvAwHpCHfdxsniYRqnv+SLf6eC5PCkQ5aNAAl/ywOLQAWS0XgYti3LyZ4iuGIYcUE0IDDmhWl68V27iXcLIK+rBRqBGxSdk8xR+zSE8fpO4mXpxn8SH0Butex8PJ+oHTbmdXIUAXdn6HGQKBgQCvAB1rqtsRoL72ADxtCHy78u5srwXxhmyqrc6LgzIjQzn2vejaLJO6wfSbmFnwDNimAwNQbgf2ekkwqphjxBozz8qB66GNrPpWccoZYmcdT48CIUO68MCmQBf3R2GbhWPnKu/ja7kc/p1tz9eJVn70E2kLWK4+EdZgwQHqlhj6SQKBgF4AmbdpYOb5s9Li1vyhHJIEHkpLQi15lkPdb/g7SK26BNJa5b5fu5DYf2fDwCtXCZ0AcN/+EQwVLbOzPzGy2R9/g+NKTdkiPvOnAAM8QH2+HaX+ix3CI3o3DnFpGF6hJieRkzR/f3Ximryks451rZMrTWEIncKMzSstFm3Izy0xAoGBAJQaMqlzpM+QaJiytJNeqRpPWRsi0Dkf4XqJXPWLOrApSISsafZF5vk2ZOeIqRsVCBH3LdfVIJxEBAF4l/Sd2q7xC9JHawJDqa4ea7VwL68ANH2w3jcJ3j6DQqf7NIe/lSGxYF6Jt+74oRFHxN3GDSf+z91DYfZz8hQnyphKDNEJ" -##支付宝appid -#ALIPAYAPPID: "2021002156615717" -##应用公钥证书路径 -#CERTPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/appCertPublicKey.crt" -##支付宝公钥证书路径 -#PUBLICCERTPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayCertPublicKey_RSA2.crt" -##支付宝根证书路径 -#ROOTCRETPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayRootCert.crt" \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml index 5a0e6bc0..e7b2cb93 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -31,7 +31,8 @@ + + + diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml index 599fca67..fb4efb79 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -9,7 +9,7 @@ type as 'type', serial_number as 'serialNumber', content as 'content', - reply_content as 'replyContent', + charge_order_no as 'chargeOrderNo', status as 'status', remark as 'remark', create_time as 'createTime', @@ -33,7 +33,7 @@ m.type as 'type', m.serial_number as 'serialNumber', m.content as 'content', - m.reply_content as 'replyContent', + m.charge_order_no as 'chargeOrderNo', m.status as 'status', m.remark as 'remark', m.create_time as 'createTime', @@ -58,6 +58,10 @@ and cp.serial_number=#{params.serialNumber} + + and m.charge_order_no=#{params.chargeOrderNo} + + diff --git a/xhpc-modules/xhpc-order/pom.xml b/xhpc-modules/xhpc-order/pom.xml index 121691b4..f1a31b0a 100644 --- a/xhpc-modules/xhpc-order/pom.xml +++ b/xhpc-modules/xhpc-order/pom.xml @@ -99,6 +99,10 @@ com.squareup.okhttp3 okhttp + + com.ruoyi + ruoyi-common-log + diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java index d317c639..142be756 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java @@ -1,6 +1,5 @@ package com.xhpc.order.api; -import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.xhpc.common.api.WebSocketService; import com.xhpc.common.core.web.controller.BaseController; @@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; -import java.util.Calendar; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -54,7 +52,6 @@ public class XhpcChargeOrderController extends BaseController { @GetMapping("/getHistotyChargeOrderMessage") public AjaxResult getHistotyChargeOrderMessage(HttpServletRequest request) { - return iXhpcChargeOrderService.getHistotyChargeOrderMessage(request); } @@ -64,13 +61,11 @@ public class XhpcChargeOrderController extends BaseController { @GetMapping("/getHistotyChargeOrderStatusList") public TableDataInfo getHistotyChargeOrderStatusList(HttpServletRequest request) { - startPage(); List> list = iXhpcChargeOrderService.getHistotyChargeOrderStatusList(request); return getDataTable(list); } - /** * 启动充电 * @param userId @@ -107,7 +102,6 @@ public class XhpcChargeOrderController extends BaseController { @GetMapping("/list") public TableDataInfo list(HttpServletRequest request) { - startPage(); List> list = xhpcHistoryOrderService.list(request); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java index 8339dc94..3e50d7fd 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java @@ -55,16 +55,7 @@ public class XhpcPileOrderController extends BaseController { @Autowired private UserTypeService userTypeService; - private static final Logger logger = LoggerFactory.getLogger(XhpcPileOrderController.class); - /** - * 测试 - */ - @GetMapping("/test/chargeOrder/pileStartup") - private R test(@RequestParam String orderNo, @RequestParam Integer status, @RequestParam String remark) { - return null; - } - /** * 桩启动回调接口 @@ -445,7 +436,7 @@ public class XhpcPileOrderController extends BaseController { R user = userTypeService.getUser(null, xhpcChargeOrder.getUserId(), source, null, tenantId); if(user !=null && user.getData() !=null){ Map userMessage = (Map)user.getData(); - if (userMessage == null || userMessage.get("balance") == null) { + if (userMessage != null && userMessage.get("balance") != null) { xhpcHistoryOrderService.addXhpcChargeOrder(userMessage,orderNo,1); } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java index b0ac2605..75aa172f 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java @@ -82,7 +82,6 @@ public class XhpcHistoryOrderController extends BaseController { String affiliationOrganization,String evcsOrderNo,String plateNum,Integer internetId,String internetSerialNumber,String terminalName,String vinCode,String overStartTime,String overEndTime,Long personnelId) { - startPage(); List> listPage = xhpcHistoryOrderService.getListPage(phone, transactionNumber, status, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type, affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId); return getDataTable(listPage); } @@ -426,14 +425,11 @@ public class XhpcHistoryOrderController extends BaseController { @GetMapping("/test") @Scheduled(cron = "0 0/2 * * * ?") public void test(){ - logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); - logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); //小时统计 List list = xhpcHistoryOrderService.getStatistisList(3000,0); if(list !=null && list.size()>0){ for (XhpcChargeHistoryOrder xhpc:list) { - try{ //开始时间、结束时间、模型id、状态、用户id、运营商、订单id、场站id、终端id、历史订单id、时间 Date startTime = xhpc.getStartTime(); @@ -508,8 +504,6 @@ public class XhpcHistoryOrderController extends BaseController { @GetMapping("/test8") //@Scheduled(cron = "0 0/5 * * * ?") public void test8(){ - logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); - logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); //获取500条待统计历史订单 //跨时段，跨费率，计费模型 @@ -883,7 +877,7 @@ public class XhpcHistoryOrderController extends BaseController { R user = userTypeService.getUser(null, xhpcChargeOrder.getUserId(), source, null, tenantId); if(user !=null && user.getData() !=null){ Map userMessage = (Map)user.getData(); - if (userMessage == null || userMessage.get("balance") == null) { + if (userMessage != null && userMessage.get("balance") != null) { xhpcHistoryOrderService.addXhpcChargeOrder(userMessage,xhpcChargeOrder.getSerialNumber(),2); } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java index 6a477e0c..01aaefeb 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java @@ -4,6 +4,8 @@ import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.order.service.IXhpcHistoryOrderReconciliationStatusService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,6 +27,7 @@ public class XhpcHistoryOrderReconciliationStatusController extends BaseControll * 修改对账状态 * @return */ + @Log(title = "对账-修改对账状态", businessType = BusinessType.UPDATE) @PostMapping("/status") @ApiOperation(value = "修改对账状态") public AjaxResult status(@RequestBody Map map) { @@ -66,7 +69,6 @@ public class XhpcHistoryOrderReconciliationStatusController extends BaseControll @GetMapping("/page") @ApiOperation(value = "流量用户对账分页列表") public TableDataInfo page(@RequestParam Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status) { - startPage(); List> list = iXhpcHistoryOrderReconciliationStatusService.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java index 5c5907a7..6c097111 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java @@ -5,6 +5,8 @@ import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.order.service.IXhpcHistoryOrderSortingStatusService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -27,6 +29,7 @@ public class XhpcHistoryOrderSortingStatusController extends BaseController { * 修改清分状态 * @return */ + @Log(title = "清分-修改清分状态", businessType = BusinessType.UPDATE) @PostMapping("/status") @ApiOperation(value = "修改清分状态") public AjaxResult status(@RequestBody Map map) { @@ -68,7 +71,6 @@ public class XhpcHistoryOrderSortingStatusController extends BaseController { @GetMapping("/page") @ApiOperation(value = "运营商清分分页列表") public TableDataInfo page(@RequestParam Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status) { - startPage(); List> list = iXhpcHistoryOrderSortingStatusService.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java index d96eea0b..a3fe89db 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java @@ -50,7 +50,6 @@ public class XhpcRealTimeOrderController extends BaseController { public TableDataInfo list(String phone,String transactionNumber,Integer source,String chargingStationName,String terminalName,Long operatorId,String startTime,String endTime,@RequestParam("status") Integer status,@RequestParam("userId") Long userId,@RequestParam("type") Integer type, String affiliationOrganization,String plateNum,Integer internetId,String internetSerialNumber) { - startPage(); List> list = xhpcRealTimeOrderService.list(phone, transactionNumber, source, chargingStationName,terminalName, operatorId, startTime, endTime,status,userId,type,affiliationOrganization,plateNum,internetId,internetSerialNumber); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java index b5ce35e4..52bc164b 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java @@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -42,10 +43,9 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getTimeIntervalPage") - public TableDataInfo getTimeIntervalPage(String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public TableDataInfo getTimeIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - startPage(); - List> list = xhpcStatisticsService.getTimeIntervalPage(chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); + List> list = xhpcStatisticsService.getTimeIntervalPage(request,chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); return getDataTable(list); } @@ -61,10 +61,9 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getDateIntervalPage") - public TableDataInfo getDateIntervalPage(String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public TableDataInfo getDateIntervalPage(HttpServletRequest request,String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - startPage(); - List> list = xhpcStatisticsService.getDateIntervalPage(chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); + List> list = xhpcStatisticsService.getDateIntervalPage(request,chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); return getDataTable(list); } /** @@ -80,10 +79,9 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getStationIntervalPage") - public TableDataInfo getStationIntervalPage(String chargingStationIds,String operatorIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public TableDataInfo getStationIntervalPage(HttpServletRequest request,String chargingStationIds,String operatorIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - startPage(); - List> list = xhpcStatisticsService.getStationIntervalPage(chargingStationIds,operatorIds,internetUserId,operatorId,startTime,endTime,userId,type); + List> list = xhpcStatisticsService.getStationIntervalPage(request,chargingStationIds,operatorIds,internetUserId,operatorId,startTime,endTime,userId,type); return getDataTable(list); } @@ -98,10 +96,9 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getOperatorIntervalPage") - public TableDataInfo getOperatorIntervalPage(String operatorIds, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public TableDataInfo getOperatorIntervalPage(HttpServletRequest request,String operatorIds, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - startPage(); - List> list = xhpcStatisticsService.getOperatorIntervalPage(operatorIds,operatorId,startTime,endTime,userId,type); + List> list = xhpcStatisticsService.getOperatorIntervalPage(request,operatorIds,operatorId,startTime,endTime,userId,type); return getDataTable(list); } @@ -116,10 +113,10 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getInternetUserIntervalPage") - public TableDataInfo getInternetUserIntervalPage(String internetUserIds,Long internetUserId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public TableDataInfo getInternetUserIntervalPage(HttpServletRequest request,String internetUserIds,Long internetUserId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { startPage(); - List> list = xhpcStatisticsService.getInternetUserIntervalPage(internetUserIds,internetUserId,startTime,endTime,userId,type); + List> list = xhpcStatisticsService.getInternetUserIntervalPage(request,internetUserIds,internetUserId,startTime,endTime,userId,type); return getDataTable(list); } @@ -136,10 +133,9 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getTerminalIntervalPage") - public TableDataInfo getTerminalIntervalPage(String chargingStationId,String terminalId,Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public TableDataInfo getTerminalIntervalPage(HttpServletRequest request,String chargingStationId,String terminalId,Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - startPage(); - List> list = xhpcStatisticsService.getTerminalIntervalPage(chargingStationId,terminalId,operatorId,startTime,endTime,userId,type); + List> list = xhpcStatisticsService.getTerminalIntervalPage(request,chargingStationId,terminalId,operatorId,startTime,endTime,userId,type); return getDataTable(list); } @@ -151,12 +147,12 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getChargingStationList") - public AjaxResult getChargingStationList(Long operatorId, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public AjaxResult getChargingStationList(HttpServletRequest request,Long operatorId, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { if (type == null || type==3) { return AjaxResult.success(); } - return xhpcStatisticsService.getChargingStationList(operatorId, userId, type); + return xhpcStatisticsService.getChargingStationList(request,operatorId, userId, type); } /** @@ -167,12 +163,12 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getOperatorList") - public AjaxResult getOperatorList(Long operatorId, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public AjaxResult getOperatorList(HttpServletRequest request,Long operatorId, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { if (type == null || type==3) { return AjaxResult.success(); } - return xhpcStatisticsService.getOperatorList(operatorId, userId, type); + return xhpcStatisticsService.getOperatorList(request,operatorId, userId, type); } /** @@ -183,12 +179,12 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getInternetUserIList") - public AjaxResult getInternetUserIList(Long internetUserId, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public AjaxResult getInternetUserIList(HttpServletRequest request,Long internetUserId, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { if (type == null || type==2) { return AjaxResult.success(); } - return xhpcStatisticsService.getInternetUserIList(internetUserId, userId, type); + return xhpcStatisticsService.getInternetUserIList(request,internetUserId, userId, type); } /** @@ -199,11 +195,11 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getTerminalList") - public AjaxResult getTerminalList(Long chargingStationId, @RequestParam("userId") Long userId, @RequestParam("type") Integer type) { + public AjaxResult getTerminalList(HttpServletRequest request,Long chargingStationId, @RequestParam("userId") Long userId, @RequestParam("type") Integer type) { if (type == null || type == 3) { return AjaxResult.success(); } - return xhpcStatisticsService.getTerminalList(chargingStationId, userId, type); + return xhpcStatisticsService.getTerminalList(request,chargingStationId, userId, type); } /** @@ -213,8 +209,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getSourceList") - public AjaxResult getSourceList(@RequestParam("userId") Long userId, @RequestParam("type") Integer type) { - return xhpcStatisticsService.getSourceList(userId, type); + public AjaxResult getSourceList(HttpServletRequest request,@RequestParam("userId") Long userId, @RequestParam("type") Integer type) { + return xhpcStatisticsService.getSourceList(request,userId, type); } /** @@ -225,9 +221,9 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getSumSourceList") - public TableDataInfo getSumSourceList(String startTime, String endTime, String internetUserIds,@RequestParam("userId") Long userId, @RequestParam("type") Integer type, String chargingStationIds) { + public TableDataInfo getSumSourceList(HttpServletRequest request,String startTime, String endTime, String internetUserIds,@RequestParam("userId") Long userId, @RequestParam("type") Integer type, String chargingStationIds) { startPage(); - List> list = xhpcStatisticsService.getSumSourceList(startTime,endTime,internetUserIds,userId, type,chargingStationIds); + List> list = xhpcStatisticsService.getSumSourceList(request,startTime,endTime,internetUserIds,userId, type,chargingStationIds); return getDataTable(list); } @@ -247,8 +243,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @PostMapping("/timeInterval/export") - public void timeIntervalExport(HttpServletResponse response, String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { - xhpcStatisticsService.timeIntervalExport(response, chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); + public void timeIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { + xhpcStatisticsService.timeIntervalExport(request,response, chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); } /** @@ -263,8 +259,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @PostMapping("/dateInterval/export") - public void dateIntervalExport(HttpServletResponse response, String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { - xhpcStatisticsService.dateIntervalExport(response, chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); + public void dateIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { + xhpcStatisticsService.dateIntervalExport(request,response, chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); } /** * 电站统计导出 @@ -279,8 +275,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @PostMapping("/stationInterval/export") - public void stationIntervalExport(HttpServletResponse response, String chargingStationIds,String operatorIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { - xhpcStatisticsService.stationIntervalExport(response, chargingStationIds,operatorIds,internetUserId,operatorId,startTime,endTime,userId,type); + public void stationIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,String operatorIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { + xhpcStatisticsService.stationIntervalExport(request,response, chargingStationIds,operatorIds,internetUserId,operatorId,startTime,endTime,userId,type); } /** @@ -294,8 +290,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @PostMapping("/operatorInterval/export") - public void operatorIntervalExport(HttpServletResponse response, String operatorIds, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { - xhpcStatisticsService.operatorIntervalExport(response, operatorIds,operatorId,startTime,endTime,userId,type); + public void operatorIntervalExport(HttpServletRequest request,HttpServletResponse response, String operatorIds, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { + xhpcStatisticsService.operatorIntervalExport(request,response, operatorIds,operatorId,startTime,endTime,userId,type); } /** @@ -303,8 +299,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @PostMapping("/internetUserInterval/export") - public void internetUserIntervalExport(HttpServletResponse response, String startTime, String endTime,String internetUserIds, @RequestParam("userId") Long userId, @RequestParam("type")Integer type, String chargingStationIds) throws IOException { - xhpcStatisticsService.getSumSourceListExport(response, startTime,endTime,internetUserIds,userId,type,chargingStationIds); + public void internetUserIntervalExport(HttpServletRequest request,HttpServletResponse response, String startTime, String endTime,String internetUserIds, @RequestParam("userId") Long userId, @RequestParam("type")Integer type, String chargingStationIds) throws IOException { + xhpcStatisticsService.getSumSourceListExport(request,response, startTime,endTime,internetUserIds,userId,type,chargingStationIds); } @@ -320,8 +316,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @PostMapping("/terminalInterval/export") - public void terminalIntervalExport(HttpServletResponse response, String chargingStationId,String terminalId,Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { - xhpcStatisticsService.terminalIntervalExport(response, chargingStationId,terminalId,operatorId,startTime,endTime,userId,type); + public void terminalIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationId,String terminalId,Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { + xhpcStatisticsService.terminalIntervalExport(request,response, chargingStationId,terminalId,operatorId,startTime,endTime,userId,type); } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java index c106d027..f682d2e6 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java @@ -54,12 +54,12 @@ public interface XhpcChargeOrderMapper { /** * 判断用户是否在充电中 */ - String countXhpcRealTimeOrder(@Param("userId")Long userId); + String countXhpcRealTimeOrder(@Param("userId")Long userId,@Param("source")Integer source,@Param("tenantId")String tenantId); /** * 判断用户是否有异常订单未处理 */ - int countXhpcChargeOrder(@Param("userId")Long userId); + int countXhpcChargeOrder(@Param("userId")Long userId,@Param("source")Integer source,@Param("tenantId")String tenantId); /** * 获取终端信息 diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java index 6c7f51af..ed09318c 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java @@ -69,7 +69,7 @@ public interface XhpcHistoryOrderMapper { * @param historyOrderId * @return */ - Map gethistotyOrderMessage(@Param("userId") Long userId, @Param("historyOrderId") Long historyOrderId, @Param("type") Integer type, @Param("chargingOrderId") Long chargingOrderId, @Param("tenantId") String tenantId); + Map gethistotyOrderMessage(@Param("userId") Long userId, @Param("historyOrderId") Long historyOrderId, @Param("source") Integer source, @Param("chargingOrderId") Long chargingOrderId, @Param("tenantId") String tenantId); /** * 历史订单记录（PC） @@ -112,4 +112,10 @@ public interface XhpcHistoryOrderMapper { * 获取登陆用户信息 */ Map getLandUser(@Param("userId")Long userId); + + + /** + * 查询启动订单表 + */ + Map getchargingOrderById(@Param("chargingOrderId")Long chargingOrderId,@Param("userId")Long userId,@Param("source")Integer source,@Param("tenantId")String tenantId); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java index a3667492..b36de127 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java @@ -27,7 +27,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getTimeIntervalPage(@Param("chargingStationIds") List chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId); + List> getTimeIntervalPage(@Param("chargingStationIds") List chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); /** @@ -40,7 +40,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getDateIntervalPage(@Param("chargingStationIds") List chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId")Long userId); + List> getDateIntervalPage(@Param("chargingStationIds") List chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId")Long userId,@Param("tenantId")String tenantId); /** * 电站统计 @@ -53,7 +53,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getStationIntervalPage(@Param("chargingStationIds") List chargingStationIds,@Param("operatorUserId") List operatorUserId,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId); + List> getStationIntervalPage(@Param("chargingStationIds") List chargingStationIds,@Param("operatorUserId") List operatorUserId,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); /** * 运营商统计 @@ -64,7 +64,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getOperatorIntervalPage(@Param("operatorUserId") List operatorUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId); + List> getOperatorIntervalPage(@Param("operatorUserId") List operatorUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); /** * 流量方统计 @@ -75,7 +75,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getInternetUserIntervalPage(@Param("internetIds") List internetIds,@Param("internetUserId") Long internetUserId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId); + List> getInternetUserIntervalPage(@Param("internetIds") List internetIds,@Param("internetUserId") Long internetUserId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); /** @@ -88,7 +88,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getTerminalIntervalPage(@Param("chargingStationId") String chargingStationId,@Param("terminalId") String terminalId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId); + List> getTerminalIntervalPage(@Param("chargingStationId") String chargingStationId,@Param("terminalId") String terminalId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); /** @@ -98,7 +98,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getChargingStationList(@Param("operatorId")Long operatorId,@Param("userId")Long userId,@Param("type")Integer type); + List> getChargingStationList(@Param("operatorId")Long operatorId,@Param("userId")Long userId,@Param("type")Integer type,@Param("tenantId")String tenantId); /** * 运营商列表 @@ -107,7 +107,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getOperatorList(@Param("operatorId")Long operatorId,@Param("userId")Long userId,@Param("type")Integer type); + List> getOperatorList(@Param("operatorId")Long operatorId,@Param("userId")Long userId,@Param("type")Integer type,@Param("tenantId")String tenantId); /** @@ -117,7 +117,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getInternetUserIList(@Param("internetUserId")Long internetUserId,@Param("userId")Long userId,@Param("type")Integer type); + List> getInternetUserIList(@Param("internetUserId")Long internetUserId,@Param("userId")Long userId,@Param("type")Integer type,@Param("tenantId")String tenantId); /** * 终端列表 @@ -126,7 +126,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getTerminalList(@Param("chargingStationId")Long chargingStationId,@Param("userId")Long userId,@Param("type")Integer type); + List> getTerminalList(@Param("chargingStationId")Long chargingStationId,@Param("userId")Long userId,@Param("type")Integer type,@Param("tenantId")String tenantId); /** * 添加时段订单统计 @@ -144,7 +144,7 @@ public interface XhpcStatisticsServiceMapper { * 获取流量方列表 * @return */ - List> getInternetList(@Param("userId")Long userId); + List> getInternetList(@Param("userId")Long userId,@Param("tenantId")String tenantId); /** @@ -153,7 +153,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getSumSourceList(@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("sourceIds")List sourceIds, @Param("userId")Long userId, @Param("type")Integer type,@Param("chargingStationIdList")List chargingStationIdList); + List> getSumSourceList(@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("sourceIds")List sourceIds, @Param("userId")Long userId, @Param("type")Integer type,@Param("chargingStationIdList")List chargingStationIdList,@Param("tenantId")String tenantId); /** * 获取登陆用户信息 diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java index 57e1867e..7d702184 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java @@ -19,7 +19,7 @@ public interface IXhpcHistoryOrderService { /** * 用户历史订单表 - * @param userId + * @param * @return */ List> list(HttpServletRequest request); diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java index b5137124..1bddceb4 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java @@ -138,4 +138,9 @@ public interface IXhpcRealTimeOrderService { */ Map addOrderTime(CacheRealtimeData cacheRealtimeData, XhpcChargeOrder xhpcChargeOrder, String orderNo, Integer type); + + /** + * 获取一条实时数据 + */ + XhpcRealTimeOrder getChargingOrderId(Long chargingOrderId,Integer type); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcStatisticsService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcStatisticsService.java index 4cf4c5c9..2210ef8f 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcStatisticsService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcStatisticsService.java @@ -6,6 +6,7 @@ import com.xhpc.order.domain.XhpcStatisticsTimeInterval; import org.springframework.web.bind.annotation.RequestParam; import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; @@ -29,7 +30,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getTimeIntervalPage(String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); + List> getTimeIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); /** @@ -43,7 +44,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getDateIntervalPage(String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); + List> getDateIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); /** * 电站统计 @@ -57,7 +58,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getStationIntervalPage(String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); + List> getStationIntervalPage(HttpServletRequest request,String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); /** * 运营商统计 @@ -69,7 +70,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getOperatorIntervalPage(String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type); + List> getOperatorIntervalPage(HttpServletRequest request,String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type); /** @@ -82,7 +83,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getInternetUserIntervalPage(String internetUserIds, Long internetUserId, String startTime, String endTime, Long userId, Integer type); + List> getInternetUserIntervalPage(HttpServletRequest request,String internetUserIds, Long internetUserId, String startTime, String endTime, Long userId, Integer type); /** @@ -96,7 +97,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getTerminalIntervalPage(String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type); + List> getTerminalIntervalPage(HttpServletRequest request,String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type); /** * 电站列表 @@ -105,7 +106,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - AjaxResult getChargingStationList(Long operatorId,Long userId,Integer type); + AjaxResult getChargingStationList(HttpServletRequest request,Long operatorId,Long userId,Integer type); /** * 运营商列表 @@ -114,7 +115,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - AjaxResult getOperatorList(Long operatorId,Long userId,Integer type); + AjaxResult getOperatorList(HttpServletRequest request,Long operatorId,Long userId,Integer type); /** * 流量方列表 @@ -123,7 +124,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - AjaxResult getInternetUserIList(Long internetUserId,Long userId,Integer type); + AjaxResult getInternetUserIList(HttpServletRequest request,Long internetUserId,Long userId,Integer type); /** @@ -133,7 +134,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - AjaxResult getTerminalList(Long chargingStationId,Long userId,Integer type); + AjaxResult getTerminalList(HttpServletRequest request,Long chargingStationId,Long userId,Integer type); /** * 订单来源列表 @@ -141,7 +142,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - AjaxResult getSourceList(Long userId,Integer type); + AjaxResult getSourceList(HttpServletRequest request,Long userId,Integer type); /** * 订单来源列表 @@ -149,7 +150,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getSumSourceList(String startTime, String endTime, String sourceIds,Long userId,Integer type, String chargingStationIds); + List> getSumSourceList(HttpServletRequest request,String startTime, String endTime, String sourceIds,Long userId,Integer type, String chargingStationIds); /** * 添加时段订单统计 @@ -180,7 +181,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - void timeIntervalExport(HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; + void timeIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; /** @@ -194,7 +195,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - void dateIntervalExport(HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; + void dateIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; /** * 电站统计导出 @@ -208,7 +209,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - void stationIntervalExport(HttpServletResponse response, String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; + void stationIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; /** * 运营商统计导出 @@ -220,14 +221,14 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - void operatorIntervalExport(HttpServletResponse response, String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; + void operatorIntervalExport(HttpServletRequest request,HttpServletResponse response, String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; /** * 订单来源统计导出 * @return */ - void getSumSourceListExport(HttpServletResponse response, String startTime, String endTime, String sourceIds,Long userId,Integer type, String chargingStationIds) throws IOException; + void getSumSourceListExport(HttpServletRequest request,HttpServletResponse response, String startTime, String endTime, String sourceIds,Long userId,Integer type, String chargingStationIds) throws IOException; /** @@ -241,7 +242,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - void terminalIntervalExport(HttpServletResponse response, String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; + void terminalIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java index e6ca05bb..b83c85ce 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java @@ -1,11 +1,14 @@ package com.xhpc.order.service.impl; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import com.xhpc.common.api.PowerPileService; import com.xhpc.common.api.UserTypeService; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.data.down.StartChargingData; import com.xhpc.common.data.redis.CacheRealtimeData; import com.xhpc.common.data.redis.StaticBeanUtil; @@ -16,10 +19,13 @@ import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; import com.xhpc.order.domain.XhpcChargeOrder; import com.xhpc.order.domain.XhpcOrderRedisRecord; +import com.xhpc.order.domain.XhpcRealTimeOrder; import com.xhpc.order.mapper.XhpcChargeOrderMapper; import com.xhpc.order.mapper.XhpcInternetUserMapper; import com.xhpc.order.service.IXhpcChargeOrderService; +import com.xhpc.order.service.IXhpcRealTimeOrderService; import com.xhpc.system.api.model.LoginUser; +import org.bouncycastle.jcajce.provider.asymmetric.util.BaseAgreementSpi; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -40,7 +46,7 @@ import static com.xhpc.common.data.redis.StaticBeanUtil.genOrder; * @date 2021/8/4 9:54 */ @Service -public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { +public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChargeOrderService { public static RedisService REDIS; @@ -56,6 +62,8 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { private TokenService tokenService; @Autowired private UserTypeService userTypeService; + @Autowired + private IXhpcRealTimeOrderService xhpcRealTimeOrderService; private static final Logger logger = LoggerFactory.getLogger(XhpcChargeOrderServiceImpl.class); //队列名称 @@ -87,7 +95,30 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { @Override public List> getHistotyChargeOrderStatusList(HttpServletRequest request) { LoginUser loginUser = tokenService.getLoginUser(request); - return xhpcChargeOrderMapper.getHistotyChargeOrderStatusList(loginUser.getUserid(),loginUser.getTenantId(),loginUser.getUserType()); + startPage(); + List> list = xhpcChargeOrderMapper.getHistotyChargeOrderStatusList(loginUser.getUserid(), loginUser.getTenantId(), loginUser.getUserType()); + if(list !=null && list.size()>0){ + for (int i = 0; i map = list.get(i); + //获取该订单最后一条实时数据 + Map cacheMap = redisService.getCacheMap("order:" + map.get("serialNumber").toString()); + if(cacheMap !=null && cacheMap.size()>0){ + List CacheRealtimeDataList = (List) cacheMap.get("realtimeDataList"); + if(CacheRealtimeDataList !=null && CacheRealtimeDataList.size()>0){ + CacheRealtimeData endData = CacheRealtimeDataList.get(list.size() - 1); + if (endData != null) { + map.put("actPrice", new BigDecimal(endData.getAmountCharged()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_DOWN)); + } + } + }else{ + XhpcRealTimeOrder endRealTimeOrder = xhpcRealTimeOrderService.getChargingOrderId(Long.valueOf(map.get("chargeOrderId").toString()), 2); + if (endRealTimeOrder != null) { + map.put("actPrice", endRealTimeOrder.getAmountCharged()); + } + } + } + } + return list; } @Override @@ -124,7 +155,7 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { return AjaxResult.error(1100, "金额小于5元,不能充电，请充值后再进行充电"); } //充电用户是否存在异常的订单 - int j = xhpcChargeOrderMapper.countXhpcChargeOrder(userId); + int j = xhpcChargeOrderMapper.countXhpcChargeOrder(userId,userType,tenantId); if (j > 0) { return AjaxResult.error(1103, "你有异常订单未解决，请拨打客服电话进行解决"); } @@ -133,7 +164,7 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { return AjaxResult.error(1101, "你有申请退款订单在审核中,需要充电请取消申请退款"); } //充电用户是否在充电中 - String i = xhpcChargeOrderMapper.countXhpcRealTimeOrder(userId); + String i = xhpcChargeOrderMapper.countXhpcRealTimeOrder(userId,userType,tenantId); if (!"".equals(i) && i!=null) { return AjaxResult.error(1102, "车辆正在充电,请查询车辆充电信息"); } @@ -246,8 +277,9 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { xhpcChargeOrder.setTerminalId(xhpcTerminal.getTerminalId()); xhpcChargeOrder.setGunId(xhpcTerminal.getSerialNumber()); xhpcChargeOrder.setSerialNumber(orderNo); - xhpcChargeOrder.setSource(0); + xhpcChargeOrder.setSource(userType); xhpcChargeOrder.setStatus(-1); + xhpcChargeOrder.setTenantId(tenantId); if (xhpcChargingPileById != null && xhpcChargingPileById.get("power") != null) { xhpcChargeOrder.setPower(xhpcChargingPileById.get("power").toString()); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java index f298f344..27482127 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java @@ -4,6 +4,7 @@ import com.xhpc.common.core.constant.HttpStatus; import com.xhpc.common.core.constant.StatusConstants; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.redis.service.RedisService; import com.xhpc.order.domain.XhpcHistoryOrder; import com.xhpc.order.domain.XhpcHistoryOrderReconciliationStatus; @@ -23,7 +24,7 @@ import java.util.Map; * @author ruoyi */ @Service -public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHistoryOrderReconciliationStatusService { +public class XhpcHistoryOrderReconciliationStatusServiceImpl extends BaseService implements IXhpcHistoryOrderReconciliationStatusService { @Autowired private XhpcHistoryOrderReconciliationStatusMapper xhpcHistoryOrderReconciliationStatusMapper; @@ -126,6 +127,7 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis if (StringUtils.isNotNull(map)) { String privilege = StringUtils.valueOf(map.get("privilege")); if (StringUtils.isNotEmpty(privilege)) { + startPage(); if (StatusConstants.OPERATION_POWER_TYPE == Integer.parseInt(privilege)) { String operatorId = StringUtils.valueOf(map.get("operatorId")); return xhpcHistoryOrderReconciliationStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, operatorId, null); @@ -134,6 +136,7 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis } } } + startPage(); return xhpcHistoryOrderReconciliationStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, null, null); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java index 9919f83b..84e52108 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java @@ -12,6 +12,7 @@ import com.xhpc.common.api.UserTypeService; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.data.redis.CacheRealtimeData; import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.security.service.TokenService; @@ -19,6 +20,7 @@ import com.xhpc.common.util.EvcsUtil; import com.xhpc.common.util.UserTypeUtil; import com.xhpc.order.domain.XhpcChargeOrder; import com.xhpc.order.domain.XhpcHistoryOrder; +import com.xhpc.order.domain.XhpcRealTimeOrder; import com.xhpc.order.dto.XhpcChargeHistoryOrder; import com.xhpc.order.mapper.XhpcHistoryOrderMapper; import com.xhpc.order.mapper.XhpcRealTimeOrderMapper; @@ -47,7 +49,7 @@ import java.util.concurrent.Executors; * @date 2021/8/3 21:23 */ @Service -public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService { +public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHistoryOrderService { @Resource private XhpcHistoryOrderMapper xhpcHistoryOrderMapper; @@ -86,7 +88,8 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService { R user = userTypeService.getUser(null, userid, userType, null, tenantId); if(user !=null && user.getData() !=null){ Map userMessage = (Map)user.getData(); - if (userMessage == null) { + if (userMessage != null) { + startPage(); return xhpcHistoryOrderMapper.list(userid,userType,tenantId); } } @@ -102,7 +105,95 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService { @Override public AjaxResult gethistotyOrderMessage(HttpServletRequest request, Long userId, Long historyOrderId, Integer type, Long chargingOrderId) { LoginUser loginUser = tokenService.getLoginUser(request); - return AjaxResult.success(xhpcHistoryOrderMapper.gethistotyOrderMessage(loginUser.getUserid(), historyOrderId, type, chargingOrderId,loginUser.getTenantId())); + + Map map = xhpcHistoryOrderMapper.gethistotyOrderMessage(loginUser.getUserid(), historyOrderId, loginUser.getUserType(), chargingOrderId, loginUser.getTenantId()); + if(map !=null){ + return AjaxResult.success(map); + } + //查询最后一帧数据 + if(chargingOrderId !=null){ + Map stringObjectMap = xhpcHistoryOrderMapper.getchargingOrderById(chargingOrderId,loginUser.getUserid(),loginUser.getUserType(),loginUser.getTenantId()); + if(stringObjectMap !=null){ + //获取该订单最后一条实时数据 + Map cacheMap = redisService.getCacheMap("order:" + stringObjectMap.get("serialNumber").toString()); + List list = (List) cacheMap.get("realtimeDataList"); + CacheRealtimeData startData =new CacheRealtimeData(); + CacheRealtimeData endData =new CacheRealtimeData(); + + Date startTime = null; + Date endTime = null; + BigDecimal amountCharged = new BigDecimal(0); + //充电度数 + BigDecimal chargingDegree = new BigDecimal(0); + if (list != null && list.size() > 0) { + endData =list.get(list.size()-1); + for (int i = 0; i 0){ + break; + } + } + } + Long rateModelId = Long.valueOf(stringObjectMap.get("rateModelId").toString()); + if(endData !=null && endData.getAmountCharged() !=null){ + //最后一祯时间 + endTime = DateUtil.parse(endData.getCreateTime()); + startTime =DateUtil.parse(startData.getCreateTime()); + //充电时长 + Long tiem = (endTime.getTime() - startTime.getTime()) / 1000; + if (tiem > 3600) { + long hours = tiem / 3600; + double mins = (double) ((tiem - (hours * 3600)) / 60); + stringObjectMap.put("chargingTime",hours + "时" + new BigDecimal(mins).setScale(0) + "分"); + } else { + double mins = (double) (tiem / 60); + stringObjectMap.put("chargingTime",new BigDecimal(mins).setScale(0) + "分"); + } + chargingDegree = new BigDecimal(endData.getChargingDegree()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_DOWN); + stringObjectMap.put("chargingDegree",chargingDegree); + amountCharged = new BigDecimal(endData.getAmountCharged()).divide(new BigDecimal(10000),2,BigDecimal.ROUND_DOWN); + stringObjectMap.put("actPrice",amountCharged); + }else{ + //当没有缓存数据时，查询数据库 + XhpcRealTimeOrder startRealTimeOrder = xhpcRealTimeOrderService.getChargingOrderId(chargingOrderId, 1); + XhpcRealTimeOrder endRealTimeOrder = xhpcRealTimeOrderService.getChargingOrderId(chargingOrderId, 2); + if(startRealTimeOrder==null || endRealTimeOrder==null){ + return AjaxResult.success(); + } + //最后一祯时间 + endTime = endRealTimeOrder.getCreateTime(); + startTime = startRealTimeOrder.getCreateTime(); + chargingDegree = endRealTimeOrder.getChargingDegree(); + stringObjectMap.put("chargingDegree",chargingDegree); + stringObjectMap.put("chargingTime",endRealTimeOrder.getChargingTime()); + amountCharged=endRealTimeOrder.getAmountCharged(); + stringObjectMap.put("actPrice",amountCharged); + } + BigDecimal powerPriceTotal =new BigDecimal(0); + //1时间没有跨天 + DateTime parse = DateUtil.parse(DateUtil.format(startTime, "yyyy-MM-dd"), "yyyy-MM-dd"); + DateTime parse1 = DateUtil.parse(DateUtil.format(endTime, "yyyy-MM-dd"), "yyyy-MM-dd"); + //每分钟多少度电 + BigDecimal decimal = new BigDecimal((endTime.getTime() - startTime.getTime())).divide(new BigDecimal(60000),4,BigDecimal.ROUND_DOWN); + BigDecimal divide = chargingDegree.divide(decimal,4,BigDecimal.ROUND_DOWN); + long betweenDay = DateUtil.between(parse,parse1, DateUnit.DAY); + if(betweenDay==0){ + powerPriceTotal = getBigDecimal(rateModelId,DateUtil.formatTime(startTime), DateUtil.formatTime(endTime), powerPriceTotal, divide); + }else{ + //跨天 + powerPriceTotal = getBigDecimal(rateModelId, DateUtil.formatTime(startTime), "23:59:59", powerPriceTotal, divide); + System.out.println(">>>>>>跨天前>>>>>>>"+powerPriceTotal); + //明天 + DateTime tomorrow = DateUtil.offsetDay(startTime,1); + Date startTime3 = DateUtil.beginOfDay(tomorrow); + powerPriceTotal = getBigDecimal(rateModelId, DateUtil.formatTime(startTime3), DateUtil.formatTime(endTime), powerPriceTotal, divide); + System.out.println(">>>>>>跨天后>>>>>>>"+powerPriceTotal); + } + stringObjectMap.put("actPowerPrice",powerPriceTotal); + } + return AjaxResult.success(stringObjectMap); + } + return AjaxResult.success(); } @Override @@ -134,6 +225,7 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService { Map landUser = xhpcHistoryOrderMapper.getLandUser(logUserId); if (landUser != null) { if (landUser.get("userType") != null) { + startPage(); if ("01".equals(landUser.get("userType").toString())) { Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); //运营商看自己的场站 @@ -146,6 +238,7 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService { } } else { + startPage(); list = xhpcHistoryOrderMapper.getListPage(phone, transactionNumber, 0, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type, number,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId); } return list; @@ -799,11 +892,41 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService { return powerPriceTotal; } - private BigDecimal getRateTimeList(String startTime, String endTime, BigDecimal degree, BigDecimal powerPrice) { - BigDecimal v = new BigDecimal((DateUtil.parse(endTime).getTime() - DateUtil.parse(startTime).getTime()) / 60000).multiply(degree); - BigDecimal multiply = powerPrice.multiply(v).setScale(2, BigDecimal.ROUND_DOWN); - return multiply; + private BigDecimal getBigDecimal(Long rateModelId, String startTime, String updateTime, BigDecimal powerPriceTotal, BigDecimal divide) { + List> reatTimeList = getReatTimeList(startTime,updateTime, rateModelId); + for (int i = 0; i map = reatTimeList.get(i); + String startTime1 = map.get("startTime").toString(); + String endTime1 = map.get("endTime").toString(); + BigDecimal powerFee =new BigDecimal(map.get("powerFee").toString()); + if("00:00:00".equals(endTime1)){ + endTime1="23:59:59"; + } + //获取费率 + if(size==1){ + powerPriceTotal = powerPriceTotal.add(getRateTimeList(startTime,updateTime,divide,powerFee)); + }else{ + if(i==0){ + powerPriceTotal = powerPriceTotal.add(getRateTimeList(startTime,endTime1,divide,powerFee)); + } else if(i landUser = xhpcHistoryOrderService.getLandUser(logUserId); if(landUser !=null){ + startPage(); if(landUser.get("userType") !=null){ if("01".equals(landUser.get("userType").toString())){ Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); @@ -96,6 +98,7 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService { } } }else{ + startPage(); list = xhpcRealTimeOrderMapper.list(phone,transactionNumber,source,chargingStationName,terminalName,operatorId,startTime,endTime,number,status,logUserId,0,affiliationOrganization,plateNum,internetId,internetSerialNumber); } @@ -824,6 +827,11 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService { return map; } + @Override + public XhpcRealTimeOrder getChargingOrderId(Long chargingOrderId, Integer type) { + return xhpcRealTimeOrderMapper.getChargingOrderId(chargingOrderId, type); + } + private BigDecimal getBigDecimal(Long rateModelId, String startTime, String updateTime, BigDecimal powerPriceTotal, BigDecimal divide) { List> reatTimeList = xhpcHistoryOrderService.getReatTimeList(startTime,updateTime, rateModelId); for (int i = 0; i > getTimeIntervalPage(String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { + public List> getTimeIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { if (getJudge(internetUserId, operatorId, type)){ return new ArrayList<>(); } @@ -44,24 +53,24 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { chargingStationId= Arrays.asList(chargingStationIds.split(",")); } //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); + LoginUser loginUser = tokenService.getLoginUser(request); List> list =new ArrayList<>(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString()) || "03".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 2,logUserId); - } - } + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + startPage(); + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); + }else{ + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); } }else{ - list =xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,logUserId); + startPage(); + list =xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); } List> page =new ArrayList<>(); if(list !=null && list.size()>0){ @@ -156,7 +165,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { return page; } @Override - public List> getDateIntervalPage(String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { + public List> getDateIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { if (getJudge(internetUserId, operatorId, type)){ return new ArrayList<>(); } @@ -164,33 +173,33 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { if(!"".equals(chargingStationIds) && chargingStationIds !=null){ chargingStationId= Arrays.asList(chargingStationIds.split(",")); } - //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + //获取登陆用户 List> list =new ArrayList<>(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 2,logUserId); - } - } + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + startPage(); + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); + }else{ + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); } }else{ - list =xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,logUserId); + startPage(); + list =xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); } return list; } @Override - public List> getStationIntervalPage(String chargingStationIds, String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { + public List> getStationIntervalPage(HttpServletRequest request,String chargingStationIds, String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { if (getJudge(internetUserId, operatorId, type)){ return new ArrayList<>(); } @@ -202,26 +211,24 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { if(!"".equals(operatorIds) && operatorIds !=null){ operatorUserId= Arrays.asList(operatorIds.split(",")); } - - //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); List> list =new ArrayList<>(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString()) || "03".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,1,logOperatorId); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,2,logUserId); - } - } + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + startPage(); + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,1,logOperatorId,tenantId); + }else{ + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,2,sysUserId,tenantId); } }else{ - list =xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,0,logUserId); + startPage(); + list =xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,0,sysUserId,tenantId); } @@ -229,7 +236,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { } @Override - public List> getOperatorIntervalPage(String operatorIds, Long operatorId, String startTime, String endTime, Long userId, Integer type) { + public List> getOperatorIntervalPage(HttpServletRequest request,String operatorIds, Long operatorId, String startTime, String endTime, Long userId, Integer type) { if(getJudge(null,operatorId,type)){ return new ArrayList<>(); } @@ -237,33 +244,31 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { if(!"".equals(operatorIds) && operatorIds !=null){ operatorUserId= Arrays.asList(operatorIds.split(",")); } - - //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); List> list =new ArrayList<>(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString()) || "03".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 1,logOperatorId); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 2,logUserId); - } - } + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + startPage(); + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); + }else{ + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); } }else{ - list =xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 0,logUserId); + startPage(); + list =xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); } return list; } @Override - public List> getInternetUserIntervalPage(String internetUserIds, Long internetUserId, String startTime, String endTime, Long userId, Integer type) { + public List> getInternetUserIntervalPage(HttpServletRequest request,String internetUserIds, Long internetUserId, String startTime, String endTime, Long userId, Integer type) { if(getJudge(internetUserId,null,type)){ return new ArrayList<>(); } @@ -271,34 +276,38 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { if(!"".equals(internetUserIds) && internetUserIds !=null){ internetIds= Arrays.asList(internetUserIds.split(",")); } + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); // if(("".equals(startTime) && "".equals(endTime)) ||(startTime==null && endTime==null)){ // startTime =date(1); // endTime =date(2); // } - return xhpcStatisticsServiceMapper.getInternetUserIntervalPage(internetIds, internetUserId, startTime, endTime, type,userId); + return xhpcStatisticsServiceMapper.getInternetUserIntervalPage(internetIds, internetUserId, startTime, endTime, type,sysUserId,tenantId); } @Override - public List> getTerminalIntervalPage(String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { + public List> getTerminalIntervalPage(HttpServletRequest request,String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); + LoginUser loginUser = tokenService.getLoginUser(request); List> list =new ArrayList<>(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 1,logOperatorId); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 2,logUserId); - } - } + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + startPage(); + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); + }else{ + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 2,sysUserId,tenantId); } }else{ - list =xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 0,logUserId); + startPage(); + list =xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 0,sysUserId,tenantId); } @@ -306,114 +315,104 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { } @Override - public AjaxResult getChargingStationList(Long operatorId, Long userId, Integer type) { - + public AjaxResult getChargingStationList(HttpServletRequest request,Long operatorId, Long userId, Integer type) { + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - return AjaxResult.success(xhpcStatisticsServiceMapper.getChargingStationList(operatorId, logOperatorId, 1)); - }else{ - //查询赋值的场站 - return AjaxResult.success(xhpcStatisticsServiceMapper.getChargingStationList(operatorId, logUserId, 2)); - } - } + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + return AjaxResult.success(xhpcStatisticsServiceMapper.getChargingStationList(operatorId, logOperatorId, 1,tenantId)); + }else{ + //查询赋值的场站 + return AjaxResult.success(xhpcStatisticsServiceMapper.getChargingStationList(operatorId, sysUserId, 2,tenantId)); } }else{ - return AjaxResult.success(xhpcStatisticsServiceMapper.getChargingStationList(operatorId, logUserId, 0)); + return AjaxResult.success(xhpcStatisticsServiceMapper.getChargingStationList(operatorId, sysUserId, 0,tenantId)); } - return AjaxResult.success(); } @Override - public AjaxResult getOperatorList(Long operatorId, Long userId, Integer type) { + public AjaxResult getOperatorList(HttpServletRequest request,Long operatorId, Long userId, Integer type) { //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - return AjaxResult.success(xhpcStatisticsServiceMapper.getOperatorList(operatorId, logOperatorId, 1)); - }else{ - //查询赋值的场站 - return AjaxResult.success(xhpcStatisticsServiceMapper.getOperatorList(operatorId, logUserId, 2)); - } - } + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + return AjaxResult.success(xhpcStatisticsServiceMapper.getOperatorList(operatorId, logOperatorId, 1,tenantId)); + }else{ + //查询赋值的场站 + return AjaxResult.success(xhpcStatisticsServiceMapper.getOperatorList(operatorId, sysUserId, 2,tenantId)); } }else{ - return AjaxResult.success(xhpcStatisticsServiceMapper.getOperatorList(operatorId, logUserId, 0)); + return AjaxResult.success(xhpcStatisticsServiceMapper.getOperatorList(operatorId, sysUserId, 0,tenantId)); } - return AjaxResult.success(); } @Override - public AjaxResult getInternetUserIList(Long internetUserId, Long userId, Integer type) { - return AjaxResult.success(xhpcStatisticsServiceMapper.getInternetUserIList(internetUserId, userId, type)); + public AjaxResult getInternetUserIList(HttpServletRequest request,Long internetUserId, Long userId, Integer type) { + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + return AjaxResult.success(xhpcStatisticsServiceMapper.getInternetUserIList(internetUserId, sysUserId, type,tenantId)); } @Override - public AjaxResult getTerminalList(Long chargingStationId, Long userId, Integer type) { - - //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - return AjaxResult.success(xhpcStatisticsServiceMapper.getTerminalList(chargingStationId, logOperatorId, 1)); - }else{ - //查询赋值的场站 - return AjaxResult.success(xhpcStatisticsServiceMapper.getTerminalList(chargingStationId, logUserId, 2)); - } - } + public AjaxResult getTerminalList(HttpServletRequest request,Long chargingStationId, Long userId, Integer type) { +//获取登陆用户 + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + return AjaxResult.success(xhpcStatisticsServiceMapper.getTerminalList(chargingStationId, logOperatorId, 1,tenantId)); + }else{ + //查询赋值的场站 + return AjaxResult.success(xhpcStatisticsServiceMapper.getTerminalList(chargingStationId, sysUserId, 2,tenantId)); } }else{ - return AjaxResult.success(xhpcStatisticsServiceMapper.getTerminalList(chargingStationId, logUserId, 0)); + return AjaxResult.success(xhpcStatisticsServiceMapper.getTerminalList(chargingStationId, sysUserId, 0,tenantId)); } - - - - return AjaxResult.success(); } @Override - public AjaxResult getSourceList(Long userId, Integer type) { + public AjaxResult getSourceList(HttpServletRequest request,Long userId, Integer type) { //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); //桩的统计、该时段金额 List> list = new ArrayList<>(); - Map landUser = xhpcStatisticsServiceMapper.getLandUser(logUserId); - if (landUser != null) { - if (landUser.get("userType") != null && "02".equals(landUser.get("userType").toString())) { - list = xhpcStatisticsServiceMapper.getInternetList(logUserId); - }else{ - list = xhpcStatisticsServiceMapper.getInternetList(null); - Map map1 =new HashMap<>(); - Map map2 =new HashMap<>(); - map1.put("name","微信"); - map1.put("id","微信"); - map2.put("name","支付宝"); - map2.put("id","支付宝"); - list.add(map1); - list.add(map2); - } + if (UserTypeUtil.SYS_USER_TYPE_TWO.equals(sysUser.getUserType())) { + list = xhpcStatisticsServiceMapper.getInternetList(sysUserId,tenantId); + }else{ + list = xhpcStatisticsServiceMapper.getInternetList(null,tenantId); + Map map1 =new HashMap<>(); + Map map2 =new HashMap<>(); + map1.put("name","微信"); + map1.put("id","微信"); + map2.put("name","支付宝"); + map2.put("id","支付宝"); + list.add(map1); + list.add(map2); } return AjaxResult.success(list); } @Override - public List> getSumSourceList(String startTime, String endTime, String sourceIds, Long userId, Integer type,String chargingStationIds) { + public List> getSumSourceList(HttpServletRequest request,String startTime, String endTime, String sourceIds, Long userId, Integer type,String chargingStationIds) { List sourceList =new ArrayList<>(); if(!"".equals(sourceIds) && sourceIds !=null){ sourceList= Arrays.asList(sourceIds.split(",")); @@ -422,7 +421,11 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { if(!"".equals(chargingStationIds) && chargingStationIds !=null){ chargingStationIdList= Arrays.asList(chargingStationIds.split(",")); } - return xhpcStatisticsServiceMapper.getSumSourceList(startTime, endTime, sourceList, userId, type,chargingStationIdList); + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + return xhpcStatisticsServiceMapper.getSumSourceList(startTime, endTime, sourceList, sysUserId, type,chargingStationIdList,tenantId); } @Override @@ -496,8 +499,8 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { @Override - public void timeIntervalExport(HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { - List> list = getTimeIntervalPage(chargingStationIds, internetUserId, operatorId, startTime, endTime, userId, type); + public void timeIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { + List> list = getTimeIntervalPage(request,chargingStationIds, internetUserId, operatorId, startTime, endTime, userId, type); // 通过工具类创建writer，默认创建xls格式 ExcelWriter writer = ExcelUtil.getWriter(true); @@ -535,8 +538,8 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { @Override - public void dateIntervalExport(HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { - List> list = getDateIntervalPage(chargingStationIds, internetUserId, operatorId, startTime, endTime, userId, type); + public void dateIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { + List> list = getDateIntervalPage(request,chargingStationIds, internetUserId, operatorId, startTime, endTime, userId, type); // 通过工具类创建writer，默认创建xls格式 ExcelWriter writer = ExcelUtil.getWriter(true); @@ -577,8 +580,8 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { } @Override - public void stationIntervalExport(HttpServletResponse response, String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { - List> list = getStationIntervalPage(chargingStationIds, operatorIds, internetUserId, operatorId, startTime, endTime, userId, type); + public void stationIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { + List> list = getStationIntervalPage(request,chargingStationIds, operatorIds, internetUserId, operatorId, startTime, endTime, userId, type); // 通过工具类创建writer，默认创建xls格式 ExcelWriter writer = ExcelUtil.getWriter(true); @@ -621,8 +624,8 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { } @Override - public void operatorIntervalExport(HttpServletResponse response, String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { - List> list = getOperatorIntervalPage(operatorIds, operatorId, startTime, endTime, userId, type); + public void operatorIntervalExport(HttpServletRequest request,HttpServletResponse response, String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { + List> list = getOperatorIntervalPage(request,operatorIds, operatorId, startTime, endTime, userId, type); // 通过工具类创建writer，默认创建xls格式 ExcelWriter writer = ExcelUtil.getWriter(true); @@ -665,9 +668,9 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { @Override - public void getSumSourceListExport(HttpServletResponse response, String startTime, String endTime, String sourceIds,Long userId,Integer type, String chargingStationIds) throws IOException { + public void getSumSourceListExport(HttpServletRequest request,HttpServletResponse response, String startTime, String endTime, String sourceIds,Long userId,Integer type, String chargingStationIds) throws IOException { - List> list = getSumSourceList(startTime, endTime, sourceIds, userId, type,chargingStationIds); + List> list = getSumSourceList(request,startTime, endTime, sourceIds, userId, type,chargingStationIds); // 通过工具类创建writer，默认创建xls格式 ExcelWriter writer = ExcelUtil.getWriter(true); @@ -710,8 +713,8 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { @Override - public void terminalIntervalExport(HttpServletResponse response, String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { - List> list = getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, userId, type); + public void terminalIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { + List> list = getTerminalIntervalPage(request,chargingStationId, terminalId, operatorId, startTime, endTime, userId, type); // 通过工具类创建writer，默认创建xls格式 ExcelWriter writer = ExcelUtil.getWriter(true); diff --git a/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml index 5571b791..ea99137c 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml @@ -23,6 +23,3 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.xhpc.order.mapper: debug \ No newline at end of file diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml index 7d3ef5a2..1e7e293f 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml @@ -128,11 +128,31 @@ update xhpc_app_user set balance=#{balance} where app_user_id=#{userId} @@ -685,9 +688,9 @@ union select xau.app_user_id as user_id from xhpc_app_user as xau inner join(select user_id from xhpc_history_order where source=0) us2 on us2.user_id = xau.app_user_id where xau.phone like concat('%', #{phone}, '%') union - select xcp.community_personnel_id as user_id from xhpc_community_personnel as xcp inner join(select user_id from xhpc_history_order where source=2) us3.user_id = xcp.community_personnel_id where xcp.account like concat('%', #{phone}, '%') + select xcp.community_personnel_id as user_id from xhpc_community_personnel as xcp inner join(select user_id from xhpc_history_order where source=2)us3 on us3.user_id = xcp.community_personnel_id where xcp.account like concat('%', #{phone}, '%') union - select xcup.customers_personnel_id as user_id from xhpc_customers_personnel as xcup inner join(select user_id from xhpc_history_order where source=3) us4.user_id = xcup.customers_personnel_id where xcup.account like concat('%', #{phone}, '%') + select xcup.customers_personnel_id as user_id from xhpc_customers_personnel as xcup inner join(select user_id from xhpc_history_order where source=3)us3 on us4.user_id = xcup.customers_personnel_id where xcup.account like concat('%', #{phone}, '%') ) ut on ut.app_user_id = ho.user_id where ho.status =0 and ho.del_flag=0 @@ -910,4 +913,58 @@ + + diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml index e81c2180..e6bd2a26 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml @@ -101,6 +101,9 @@ and charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{userId}) + + and tenant_id = #{tenantId} + group by status order by status @@ -145,6 +148,9 @@ and charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{userId}) + + and tenant_id = #{tenantId} + group by DATE_FORMAT(create_time,'%Y-%m-%d') order by DATE_FORMAT(create_time,'%Y-%m-%d') desc @@ -199,6 +205,9 @@ #{operatorId} + + and ss.tenant_id = #{tenantId} + group by ss.charging_station_id @@ -244,6 +253,9 @@ and ss.charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{userId}) + + and ss.tenant_id = #{tenantId} + group by ss.operator_id @@ -286,6 +298,9 @@ and ss.internet_user_id =#{internetUserId} + + and ss.tenant_id = #{tenantId} + group by ss.internet_user_id @@ -333,6 +348,9 @@ and ss.charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{userId}) + + and ss.tenant_id = #{tenantId} + group by ss.terminal_id @@ -348,6 +366,9 @@ and charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{userId}) + + and tenant_id = #{tenantId} + @@ -357,13 +378,15 @@ name as operatorName from xhpc_operator where 1=1 - and operator_id in (select operator_id from xhpc_charging_station where operator_id=#{userId}) and operator_id in (select operator_id from xhpc_charging_station where charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{userId})) + + and tenant_id = #{tenantId} + @@ -766,6 +794,9 @@ and internet_user_id=#{userId} + + and tenant_id = #{tenantId} + diff --git a/xhpc-modules/xhpc-payment/pom.xml b/xhpc-modules/xhpc-payment/pom.xml index bb3ef119..3c43cfbf 100644 --- a/xhpc-modules/xhpc-payment/pom.xml +++ b/xhpc-modules/xhpc-payment/pom.xml @@ -81,6 +81,10 @@ 3.0.0 compile + + com.ruoyi + ruoyi-common-log + diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/aspect/RepeatSubmitAspect.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/aspect/RepeatSubmitAspect.java new file mode 100644 index 00000000..d38a6b6e --- /dev/null +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/aspect/RepeatSubmitAspect.java @@ -0,0 +1,71 @@ +package com.xhpc.payment.aspect; + +import com.xhpc.common.core.annotation.NoRepeatSubmit; +import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.data.redis.StaticBeanUtil; +import com.xhpc.common.util.RequestUtils; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import org.springframework.util.Assert; + +import javax.servlet.http.HttpServletRequest; + +@Aspect +@Component +public class RepeatSubmitAspect { + + private static final Logger LOGGER = LoggerFactory.getLogger(RepeatSubmitAspect.class); + + + @Pointcut("@annotation(noRepeatSubmit)") + public void pointCut(NoRepeatSubmit noRepeatSubmit) { + + } + + @Around("pointCut(noRepeatSubmit)") + public Object around(ProceedingJoinPoint pjp, NoRepeatSubmit noRepeatSubmit) throws Throwable { + + int lockSeconds = noRepeatSubmit.lockTime(); + + HttpServletRequest request = RequestUtils.getRequest(); + Assert.notNull(request, "request can't be null"); + + // 此处可以用token或者JSessionId + String token = request.getHeader("Authorization"); + String path = request.getServletPath(); + String key = getKey(token, path); + + boolean isSuccess = StaticBeanUtil.tryLock(key, lockSeconds); + LOGGER.info("tryLock key = [{}]", key); + // 主要逻辑 + if (isSuccess) { + LOGGER.info("tryLock success, key = [{}]", key); + // 获取锁成功 + Object result; +// try { + // 执行进程 + result = pjp.proceed(); +// } finally { + // 解锁 +// StaticBeanUtil.releaseLock(key); +// LOGGER.info("releaseLock success, key = [{}]", key); +// } + return result; + } else { + // 获取锁失败，认为是重复提交的请求。 + LOGGER.info("tryLock fail, key = [{}]", key); + return new AjaxResult(200, "重复请求，请稍后再试", null); + } + } + + private String getKey(String token, String path) { + + return "lock".concat(path.replace("/", ":").concat(token.replaceAll(" ", ""))); + } + +} diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java index 1e2cb869..9c18eb43 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java @@ -12,6 +12,7 @@ import com.alipay.api.request.AlipayTradeCreateRequest; import com.alipay.api.response.AlipayTradeCreateResponse; import com.xhpc.common.api.PowerPileService; import com.xhpc.common.api.UserTypeService; +import com.xhpc.common.core.annotation.NoRepeatSubmit; import com.xhpc.common.core.constant.HttpStatus; import com.xhpc.common.core.constant.StatusConstants; import com.xhpc.common.core.domain.R; @@ -34,6 +35,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.*; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; @@ -67,6 +70,8 @@ public class AlipayPaymentController { private static final Logger logger = LoggerFactory.getLogger(AlipayPaymentController.class); + @Log(title = "支付宝-支付", businessType = BusinessType.INSERT) + @NoRepeatSubmit @PostMapping("/payment") @ApiOperation(value = "支付宝支付") private AjaxResult payment(HttpServletRequest servletRequest, @RequestBody Map map) throws Exception { @@ -93,7 +98,9 @@ public class AlipayPaymentController { Long userid = loginUser.getUserid(); Integer userType = loginUser.getUserType(); String tenantId = loginUser.getTenantId(); - + if(UserTypeUtil.CUSTOMERS_TYPE.equals(userType)){ + return AjaxResult.error(HttpStatus.ERROR_STATUS, "大客户不支持充值"); + } Map refundOrder = iXhpcRefundOrderService.getNotRefundOrder(userid,userType,tenantId); if (StringUtils.isNotNull(refundOrder)) { return AjaxResult.error(HttpStatus.ALREADY_EXISTING, "用户存正在退款"); diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java index e5fdab6d..c1af930b 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java @@ -2,6 +2,7 @@ package com.xhpc.payment.controller; import com.xhpc.common.api.PowerPileService; import com.xhpc.common.api.UserTypeService; +import com.xhpc.common.core.annotation.NoRepeatSubmit; import com.xhpc.common.core.constant.HttpStatus; import com.xhpc.common.core.constant.StatusConstants; import com.xhpc.common.core.domain.R; @@ -9,6 +10,8 @@ import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.utils.WXPayUtil; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.data.down.StartChargingData; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; import com.xhpc.payment.domain.XhpcAppUser; @@ -77,6 +80,8 @@ public class WxPaymentController { private static final Logger logger = LoggerFactory.getLogger(WxPaymentController.class); + @Log(title = "微信-支付", businessType = BusinessType.INSERT) + @NoRepeatSubmit @PostMapping("/payment") @ApiOperation(value = "微信支付") public AjaxResult payment(HttpServletRequest servletRequest, @RequestBody Map map) throws Exception { @@ -103,6 +108,11 @@ public class WxPaymentController { Long userid = loginUser.getUserid(); Integer userType = loginUser.getUserType(); String tenantId = loginUser.getTenantId(); + + if(UserTypeUtil.CUSTOMERS_TYPE.equals(userType)){ + return AjaxResult.error(HttpStatus.ERROR_STATUS, "大客户不支持充值"); + } + Map refundOrder = iXhpcRefundOrderService.getNotRefundOrder(userid,userType,tenantId); if (StringUtils.isNotNull(refundOrder)) { return AjaxResult.error(HttpStatus.ALREADY_EXISTING, "用户存正在退款"); diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRechargeOrderController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRechargeOrderController.java index f3ea159c..ca807093 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRechargeOrderController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRechargeOrderController.java @@ -83,8 +83,8 @@ public class XhpcRechargeOrderController extends BaseController { */ @GetMapping("/sumMoney") @ApiOperation(value = "充值统计订单") - public AjaxResult sumMoney(String phone, String refundOrderNumber, String status, String createTimeStart, String createTimeEnd,Integer type) { - return AjaxResult.success(iXhpcRechargeOrderService.sumMoney(phone, refundOrderNumber, status, createTimeStart, createTimeEnd,type)); + public AjaxResult sumMoney(String phone, String refundOrderNumber, String status, String createTimeStart, String createTimeEnd,Integer type,Integer source,Integer userId) { + return AjaxResult.success(iXhpcRechargeOrderService.sumMoney(phone, refundOrderNumber, status, createTimeStart, createTimeEnd,type,source,userId)); } /** diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java index df85b500..90158226 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java @@ -8,19 +8,26 @@ import com.alipay.api.domain.Participant; import com.alipay.api.request.AlipayFundTransUniTransferRequest; import com.alipay.api.response.AlipayFundTransUniTransferResponse; import com.xhpc.common.api.SmsService; +import com.xhpc.common.api.UserTypeService; import com.xhpc.common.core.constant.HttpStatus; import com.xhpc.common.core.constant.StatusConstants; +import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.DateUtils; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.utils.WXPayUtil; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.service.TokenService; +import com.xhpc.common.util.UserTypeUtil; import com.xhpc.payment.domain.XhpcAppUser; import com.xhpc.payment.domain.XhpcRefundAudit; import com.xhpc.common.domain.XhpcRefundOrder; +import com.xhpc.payment.domain.XhpcSettingConfig; import com.xhpc.payment.mapper.XhpcUserAccountStatementMapper; +import com.xhpc.payment.service.IXhpcCommonPayment; import com.xhpc.payment.service.IXhpcRefundAuditService; import com.xhpc.payment.service.IXhpcRefundOrderService; import com.xhpc.payment.service.impl.XhpcUserAccountStatementServiceImpl; @@ -82,6 +89,10 @@ public class XhpcRefundAuditController extends BaseController { private SmsService smsService; @Autowired private TokenService tokenService; + @Autowired + private IXhpcCommonPayment xhpcCommonPayment; + @Autowired + private UserTypeService userTypeService; private static final Logger logger = LoggerFactory.getLogger(XhpcRefundAuditController.class); /** @@ -90,6 +101,7 @@ public class XhpcRefundAuditController extends BaseController { * @param xhpcRefundAudit * @return */ + @Log(title = "退款-审核", businessType = BusinessType.UPDATE) @PostMapping("/examine") @ApiOperation(value = "退款审核") @Transactional @@ -120,14 +132,26 @@ public class XhpcRefundAuditController extends BaseController { return ajaxResult; } String userId = StringUtils.valueOf(map.get("userId")); - XhpcAppUser xhpcAppUser = new XhpcAppUser(); - xhpcAppUser.setAppUserId(Long.parseLong(userId)); - xhpcAppUser.setIsRefundApplication(0); - int refundApplication = xhpcUserAccountStatementMapper.updateAppUserRefundApplication(xhpcAppUser); - if (refundApplication == 0) { - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); - return AjaxResult.error(); + int source = Integer.parseInt(map.get("source").toString()); + if(UserTypeUtil.USER_TYPE.equals(source)){ + XhpcAppUser xhpcAppUser = new XhpcAppUser(); + xhpcAppUser.setAppUserId(Long.parseLong(userId)); + xhpcAppUser.setIsRefundApplication(0); + int refundApplication = xhpcUserAccountStatementMapper.updateAppUserRefundApplication(xhpcAppUser); + if (refundApplication == 0) { + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + }else if(UserTypeUtil.COMMUNIT_TYPE.equals(source)){ + int i = iXhpcRefundAuditService.updateCommunityPersonnelMoney(Long.parseLong(userId), null, 0); + if (i == 0) { + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + }else{ + AjaxResult.error(HttpStatus.DATA_ERROR, "该用户不能退款"); } + if (StatusConstants.REFUND_ORDER_STATUS_SUCCESS == xhpcRefundAudit.getStatus()) { String type = StringUtils.valueOf(map.get("type")); if (StatusConstants.OPERATION_WX_TYPE.equals(type)) { @@ -144,14 +168,14 @@ public class XhpcRefundAuditController extends BaseController { refundOrder.setRemark("退款订单状态不对"); String amount = "-" + StringUtils.valueOf(map.get("amount")); - int source = Integer.parseInt(map.get("source").toString()); + String phone=""; - if(source==0){ + if(UserTypeUtil.USER_TYPE.equals(source)){ phone=map.get("phone").toString(); }else{ phone=map.get("communityPhone").toString(); } - updateXhpcRefundOrder(refundOrder,amount,userId,phone,2); + updateXhpcRefundOrder(refundOrder,amount,userId,phone,2,source,map.get("tenantId").toString()); return AjaxResult.success(); } @@ -188,10 +212,16 @@ public class XhpcRefundAuditController extends BaseController { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error(); } - XhpcAppUser xhpcAppUser = new XhpcAppUser(); - xhpcAppUser.setAppUserId(Long.parseLong(userId)); - xhpcAppUser.setIsRefundApplication(0); - xhpcUserAccountStatementMapper.updateAppUserRefundApplication(xhpcAppUser); + if(UserTypeUtil.USER_TYPE.equals(userType)){ + XhpcAppUser xhpcAppUser = new XhpcAppUser(); + xhpcAppUser.setAppUserId(Long.parseLong(userId)); + xhpcAppUser.setIsRefundApplication(0); + xhpcUserAccountStatementMapper.updateAppUserRefundApplication(xhpcAppUser); + }else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){ + iXhpcRefundAuditService.updateCommunityPersonnelMoney(Long.parseLong(userId), null,0); + }else{ + return AjaxResult.error(HttpStatus.DATA_ERROR, "该用户不知申请退款"); + } return AjaxResult.success(); } @@ -201,6 +231,7 @@ public class XhpcRefundAuditController extends BaseController { //@PreAuthorize(hasPermi = "refund:audit:list") @GetMapping("/list") public TableDataInfo page(@RequestParam Long refundOrderId) { + startPage(); List> list = iXhpcRefundAuditService.list(refundOrderId); return getDataTable(list); } @@ -216,6 +247,7 @@ public class XhpcRefundAuditController extends BaseController { XhpcRefundOrder refundOrder=new XhpcRefundOrder(); Long refundOrderId = xhpcRefundAudit.getRefundOrderId(); refundOrder.setRefundOrderId(refundOrderId); + Map xhpcRefundOrder = iXhpcRefundOrderService.info(xhpcRefundAudit.getRefundOrderId()); if (StringUtils.isNull(xhpcRefundOrder)) { return AjaxResult.error(HttpStatus.DATA_ERROR, "订单不存在"); @@ -230,18 +262,27 @@ public class XhpcRefundAuditController extends BaseController { String userId = StringUtils.valueOf(xhpcRefundOrder.get("userId")); Double amount = Double.parseDouble(StringUtils.valueOf(xhpcRefundOrder.get("amount"))); String amountRefundOrder = "-" + amount.toString(); + String tenantId = StringUtils.valueOf(xhpcRefundOrder.get("tenantId")); + XhpcSettingConfig xhpcSettingConfig = xhpcCommonPayment.getXhpcSettingConfigTenantId(UserTypeUtil.OPERATION_WX_TYPE, refundOrder.getTenantId()); + if(xhpcSettingConfig ==null){ + refundOrder.setStatus(2); + refundOrder.setRemark("订单状态不能退款"); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); + return AjaxResult.error(HttpStatus.ERROR_STATUS, "订单状态不能退款"); + } + String examineStatus = StringUtils.valueOf(xhpcRefundOrder.get("examineStatus")); if (!"1".equals(examineStatus)) { refundOrder.setStatus(2); refundOrder.setRemark("订单状态不能退款"); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); return AjaxResult.error(HttpStatus.ERROR_STATUS, "订单状态不能退款"); } String status = StringUtils.valueOf(xhpcRefundOrder.get("status")); if (!"0".equals(status)) { refundOrder.setStatus(2); refundOrder.setRemark("订单状态不能退款"); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); return AjaxResult.error(HttpStatus.ERROR_STATUS, "订单状态不能退款"); } @@ -250,7 +291,7 @@ public class XhpcRefundAuditController extends BaseController { //证书的地址 //String certPath = ConfigListener.getConf().get("certPath"); //System.out.println("certPath:"+certPath); - httpClient = initCert(); + httpClient = initCert(xhpcSettingConfig); } catch (Exception e) { e.printStackTrace(); @@ -264,29 +305,48 @@ public class XhpcRefundAuditController extends BaseController { if (refund_fee <= 0) { refundOrder.setStatus(2); refundOrder.setRemark("订单金额出错"); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); return AjaxResult.error(HttpStatus.ERROR_STATUS, "订单金额出错"); } - - Map appUserInfo = xhpcUserAccountStatementMapper.appUserInfo(Long.parseLong(userId)); - String balance = StringUtils.valueOf(appUserInfo.get("balance")); - - if (StringUtils.isNull(appUserInfo)) { - refundOrder.setStatus(2); - refundOrder.setRemark("用户不存在"); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2); + if(UserTypeUtil.USER_TYPE.equals(source)){ + Map appUserInfo = xhpcUserAccountStatementMapper.appUserInfo(Long.parseLong(userId)); + String balance = StringUtils.valueOf(appUserInfo.get("balance")); + if (StringUtils.isNull(appUserInfo)) { + refundOrder.setStatus(2); + refundOrder.setRemark("用户不存在"); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); + return AjaxResult.error(HttpStatus.DATA_ERROR, "用户不存在"); + } + BigDecimal surplus = BigDecimal.valueOf(Double.valueOf(balance)).subtract(BigDecimal.valueOf(amount)); + if (surplus.compareTo(BigDecimal.ZERO) == -1) { + refundOrder.setStatus(2); + refundOrder.setRemark("余额不足"); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); + return AjaxResult.error(HttpStatus.ERROR_STATUS, "余额不足"); + } + }else if(UserTypeUtil.COMMUNIT_TYPE.equals(source)){ + Map communityPersonnel = iXhpcRefundAuditService.getCommunityPersonnelById(Long.parseLong(userId), tenantId); + if (StringUtils.isNull(communityPersonnel)) { + refundOrder.setStatus(2); + refundOrder.setRemark("用户不存在"); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); + return AjaxResult.error(HttpStatus.DATA_ERROR, "用户不存在"); + } + String balance = StringUtils.valueOf(communityPersonnel.get("balance")); + BigDecimal surplus = BigDecimal.valueOf(Double.valueOf(balance)).subtract(BigDecimal.valueOf(amount)); + if (surplus.compareTo(BigDecimal.ZERO) == -1) { + refundOrder.setStatus(2); + refundOrder.setRemark("余额不足"); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); + return AjaxResult.error(HttpStatus.ERROR_STATUS, "余额不足"); + } + }else{ return AjaxResult.error(HttpStatus.DATA_ERROR, "用户不存在"); } - BigDecimal surplus = BigDecimal.valueOf(Double.valueOf(balance)).subtract(BigDecimal.valueOf(amount)); - if (surplus.compareTo(BigDecimal.ZERO) == -1) { - refundOrder.setStatus(2); - refundOrder.setRemark("余额不足"); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2); - return AjaxResult.error(HttpStatus.ERROR_STATUS, "余额不足"); - } + String result = ""; - HttpPost httpPost = new HttpPost(environment.getProperty("WXTRANSFERS")); - StringEntity postEntity = new StringEntity(creatXMLParam(orderOutNumber, refund_fee.toString(), "退款申请", openId), "UTF-8"); + HttpPost httpPost = new HttpPost(xhpcSettingConfig.getWxTransfersUrl()); + StringEntity postEntity = new StringEntity(creatXMLParam(orderOutNumber, refund_fee.toString(), "退款申请", openId,xhpcSettingConfig), "UTF-8"); httpPost.addHeader("Content-Type", "text/xml"); httpPost.setEntity(postEntity); try { @@ -305,7 +365,7 @@ public class XhpcRefundAuditController extends BaseController { } finally { httpPost.abort(); } - return parseXml(result, xhpcRefundAudit.getRefundOrderId(), BigDecimal.valueOf(amount), userId,phone); + return parseXml(result, xhpcRefundAudit.getRefundOrderId(), BigDecimal.valueOf(amount), userId,phone,source,tenantId); } @@ -315,13 +375,13 @@ public class XhpcRefundAuditController extends BaseController { * @param * @throws Exception */ - private CloseableHttpClient initCert() throws Exception { - String path = "apiclient_cert.p12"; + private CloseableHttpClient initCert(XhpcSettingConfig xhpcSettingConfig) throws Exception { + //String path = "apiclient_cert.p12"; //File file = new File(this.getClass().getResource("/").getPath() + path); //线上地址 - File file = new File("/www/wwwroot/scxhua.cn/xhpc-payment/" + path); + File file = new File(xhpcSettingConfig.getWxApiclientCertPem()); // 证书密码，默认为商户ID - String key = environment.getProperty("MCHID"); + String key = xhpcSettingConfig.getWxMchId(); // 指定读取证书格式为PKCS12 KeyStore keyStore = KeyStore.getInstance("PKCS12"); // 读取本机存放的PKCS12证书文件 @@ -348,7 +408,7 @@ public class XhpcRefundAuditController extends BaseController { * @param refund_desc 退款原因 * @return */ - private String creatXMLParam(String partner_trade_no, String amount, String refund_desc, String openid) { + private String creatXMLParam(String partner_trade_no, String amount, String refund_desc, String openid,XhpcSettingConfig xhpcSettingConfig) { String param = ""; //随机字符串 String nonceStr = WXPayUtil.generateNonceStr(); @@ -358,9 +418,9 @@ public class XhpcRefundAuditController extends BaseController { param += "&check_name=" + "NO_CHECK"; //退款原因 param += "&desc=" + refund_desc; - param += "&mch_appid=" + environment.getProperty("APPID"); + param += "&mch_appid=" + xhpcSettingConfig.getWxAppId(); //商户id - param += "&mchid=" + environment.getProperty("MCHID"); + param += "&mchid=" + xhpcSettingConfig.getWxMchId(); //随机字符串 param += "&nonce_str=" + nonceStr; //用户openid @@ -368,7 +428,7 @@ public class XhpcRefundAuditController extends BaseController { //商户退款单号 一个订单唯一 param += "&partner_trade_no=" + partner_trade_no; //生成签名 添加key值 - String stringSignTemp = param + "&key=" + environment.getProperty("KEY"); + String stringSignTemp = param + "&key=" + xhpcSettingConfig.getWxMchKey(); //签名 不参与签名 默认MD5算法 String sign = StringUtils.md5(stringSignTemp); if(sign.length()!=32){ @@ -378,8 +438,8 @@ public class XhpcRefundAuditController extends BaseController { " " + amount + "\n" + " " + "NO_CHECK" + "\n" + " " + refund_desc + "\n" + - " " + environment.getProperty("APPID") + "\n" + - " " + environment.getProperty("MCHID") + "\n" + + " " + xhpcSettingConfig.getWxAppId() + "\n" + + " " + xhpcSettingConfig.getWxMchId() + "\n" + " " + nonceStr + "\n" + " " + openid + "\n" + " " + partner_trade_no + "\n" + @@ -396,7 +456,7 @@ public class XhpcRefundAuditController extends BaseController { * @param result 请求后的结果 * @return */ - private AjaxResult parseXml(String result, Long id, BigDecimal amount, String userId,String phone) { + private AjaxResult parseXml(String result, Long id, BigDecimal amount, String userId,String phone,Integer source,String tenantId) { XhpcRefundOrder refundOrder=new XhpcRefundOrder(); refundOrder.setRefundOrderId(id); String amountRefundOrder = "-" + amount.toString(); @@ -406,18 +466,13 @@ public class XhpcRefundAuditController extends BaseController { if ("FAIL".equals(result_code)) { refundOrder.setStatus(2); refundOrder.setRemark(map.get("err_code_des").toString()); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); logger.info("++++++++++++审核失败原因++++++++++++++++"+map.get("err_code_des").toString()+"错误代码："+map.get("err_code").toString()); return AjaxResult.error(map.get("err_code_des")); } else { //退款成功修改订单 - Map appUserInfo = xhpcUserAccountStatementMapper.appUserInfo(Long.parseLong(userId)); - if (StringUtils.isNotNull(appUserInfo)) { - refundOrder.setStatus(1); - refundOrder.setRemark("微信退款成功"); - refundOrder.setPaymentNo(map.get("payment_no").toString()); - refundOrder.setPaymentTime(map.get("payment_time").toString()); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,1); + if(UserTypeUtil.USER_TYPE.equals(source)){ + Map appUserInfo = xhpcUserAccountStatementMapper.appUserInfo(Long.parseLong(userId)); String balance = StringUtils.valueOf(appUserInfo.get("balance")); //减少用户余额 XhpcAppUser xhpcAppUser = new XhpcAppUser(); @@ -425,7 +480,18 @@ public class XhpcRefundAuditController extends BaseController { BigDecimal surplus =new BigDecimal(balance).subtract(amount); xhpcAppUser.setBalance(surplus); xhpcUserAccountStatementMapper.updateAppUserBalance(xhpcAppUser); + + }else if(UserTypeUtil.COMMUNIT_TYPE.equals(source)){ + Map communityPersonnel = iXhpcRefundAuditService.getCommunityPersonnelById(Long.parseLong(userId), tenantId); + BigDecimal surplus =new BigDecimal(communityPersonnel.get("balance").toString()).subtract(amount); + int i = iXhpcRefundAuditService.updateCommunityPersonnelMoney(Long.parseLong(userId), surplus,null); } + refundOrder.setStatus(1); + refundOrder.setRemark("微信退款成功"); + refundOrder.setPaymentNo(map.get("payment_no").toString()); + refundOrder.setPaymentTime(map.get("payment_time").toString()); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,1,source,tenantId); + return AjaxResult.success("退款成功"); } } catch (Exception e) { @@ -435,7 +501,7 @@ public class XhpcRefundAuditController extends BaseController { } refundOrder.setStatus(2); refundOrder.setRemark("审核异常"); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); return AjaxResult.error(); } @@ -465,17 +531,25 @@ public class XhpcRefundAuditController extends BaseController { String money = StringUtils.valueOf(xhpcRefundOrder.get("amount")); String amountRefundOrder = "-" + money; String examineStatus = StringUtils.valueOf(xhpcRefundOrder.get("examineStatus")); + String tenantId = StringUtils.valueOf(xhpcRefundOrder.get("tenantId")); + XhpcSettingConfig xhpcSettingConfig = xhpcCommonPayment.getXhpcSettingConfigTenantId(UserTypeUtil.OPERATION_ALI_PAY_TYPE, refundOrder.getTenantId()); + if(xhpcSettingConfig ==null){ + refundOrder.setStatus(2); + refundOrder.setRemark("订单状态不能退款"); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); + return AjaxResult.error(HttpStatus.ERROR_STATUS, "订单状态不能退款"); + } if (!"1".equals(examineStatus)) { refundOrder.setStatus(2); refundOrder.setRemark("订单状态不能退款"); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); return AjaxResult.error(HttpStatus.ERROR_STATUS, "订单状态不能退款"); } String status = StringUtils.valueOf(xhpcRefundOrder.get("status")); if (!"0".equals(status)) { refundOrder.setStatus(2); refundOrder.setRemark("订单状态不能退款"); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); return AjaxResult.error(HttpStatus.ERROR_STATUS, "订单状态不能退款"); } String orderOutNumber = StringUtils.valueOf(xhpcRefundOrder.get("refundOrderNumber")); @@ -488,42 +562,60 @@ public class XhpcRefundAuditController extends BaseController { if (refund_fee <= 0) { refundOrder.setStatus(2); refundOrder.setRemark("订单金额出错"); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); return AjaxResult.error(HttpStatus.ERROR_STATUS, "订单金额出错"); } - - Map appUserInfo = xhpcUserAccountStatementMapper.appUserInfo(Long.parseLong(userId)); - String balance = StringUtils.valueOf(appUserInfo.get("balance")); - - if (StringUtils.isNull(appUserInfo)) { - refundOrder.setStatus(2); - refundOrder.setRemark("用户不存在"); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2); + if(UserTypeUtil.USER_TYPE.equals(source)){ + Map appUserInfo = xhpcUserAccountStatementMapper.appUserInfo(Long.parseLong(userId)); + String balance = StringUtils.valueOf(appUserInfo.get("balance")); + if (StringUtils.isNull(appUserInfo)) { + refundOrder.setStatus(2); + refundOrder.setRemark("用户不存在"); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); + return AjaxResult.error(HttpStatus.DATA_ERROR, "用户不存在"); + } + BigDecimal surplus = BigDecimal.valueOf(Double.valueOf(balance)).subtract(BigDecimal.valueOf(amount)); + if (surplus.compareTo(BigDecimal.ZERO) == -1) { + refundOrder.setStatus(2); + refundOrder.setRemark("余额不足"); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); + return AjaxResult.error(HttpStatus.ERROR_STATUS, "余额不足"); + } + }else if(UserTypeUtil.COMMUNIT_TYPE.equals(source)){ + Map communityPersonnel = iXhpcRefundAuditService.getCommunityPersonnelById(Long.parseLong(userId), tenantId); + if (StringUtils.isNull(communityPersonnel)) { + refundOrder.setStatus(2); + refundOrder.setRemark("用户不存在"); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); + return AjaxResult.error(HttpStatus.DATA_ERROR, "用户不存在"); + } + String balance = StringUtils.valueOf(communityPersonnel.get("balance")); + BigDecimal surplus = BigDecimal.valueOf(Double.valueOf(balance)).subtract(BigDecimal.valueOf(amount)); + if (surplus.compareTo(BigDecimal.ZERO) == -1) { + refundOrder.setStatus(2); + refundOrder.setRemark("余额不足"); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); + return AjaxResult.error(HttpStatus.ERROR_STATUS, "余额不足"); + } + }else{ return AjaxResult.error(HttpStatus.DATA_ERROR, "用户不存在"); } - BigDecimal surplus = BigDecimal.valueOf(Double.valueOf(balance)).subtract(BigDecimal.valueOf(amount)); - if (surplus.compareTo(BigDecimal.ZERO) == -1) { - refundOrder.setStatus(2); - refundOrder.setRemark("余额不足"); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2); - return AjaxResult.error(HttpStatus.ERROR_STATUS, "余额不足"); - } try { String orderNumber = "alipay" + DateUtils.timePath(); /** 初始化 **/ CertAlipayRequest certAlipayRequest = new CertAlipayRequest(); /** 支付宝网关 **/ - certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do"); + certAlipayRequest.setServerUrl(xhpcSettingConfig.getZhbServerUrl()); /** 应用id，如何获取请参考：https://opensupport.alipay.com/support/helpcenter/190/201602493024 **/ - certAlipayRequest.setAppId(environment.getProperty("ALIPAYAPPID")); + certAlipayRequest.setAppId(xhpcSettingConfig.getZfbAppId()); /** 应用私钥, 如何获取请参考：https://opensupport.alipay.com/support/helpcenter/207/201602471154?ant_source=antsupport **/ - certAlipayRequest.setPrivateKey(environment.getProperty("ALIPAYPRIVATEKEY")); + certAlipayRequest.setPrivateKey(xhpcSettingConfig.getZfbPrivateKey()); /** 应用公钥证书路径，下载后保存位置的绝对路径 **/ - certAlipayRequest.setCertPath(environment.getProperty("CERTPATH")); + certAlipayRequest.setCertPath(xhpcSettingConfig.getZfbCallbackUrl()); /** 支付宝公钥证书路径，下载后保存位置的绝对路径 **/ - certAlipayRequest.setAlipayPublicCertPath(environment.getProperty("PUBLICCERTPATH")); + certAlipayRequest.setAlipayPublicCertPath(xhpcSettingConfig.getZfbAlipayCertPublicKeyRsa()); /** 支付宝根证书路径，下载后保存位置的绝对路径 **/ - certAlipayRequest.setRootCertPath(environment.getProperty("ROOTCRETPATH")); + certAlipayRequest.setRootCertPath(xhpcSettingConfig.getZfbAlipayRootCert()); /** 设置签名类型 **/ certAlipayRequest.setSignType("RSA2"); /** 设置请求格式，固定值json **/ @@ -558,25 +650,30 @@ public class XhpcRefundAuditController extends BaseController { AlipayFundTransUniTransferResponse response = alipayClient.certificateExecute(request); /** 获取接口调用结果，如果调用失败，可根据返回错误信息到该文档寻找排查方案：https://opensupport.alipay.com/support/helpcenter/107 **/ if (response.isSuccess()) { - Map appUserInfo1 = xhpcUserAccountStatementMapper.appUserInfo(Long.parseLong(userId)); //退款成功修改订单 - if (StringUtils.isNotNull(appUserInfo1)) { + if(UserTypeUtil.USER_TYPE.equals(source)){ + Map appUserInfo1 = xhpcUserAccountStatementMapper.appUserInfo(Long.parseLong(userId)); + if (StringUtils.isNotNull(appUserInfo1)) { + String balance1 = StringUtils.valueOf(appUserInfo1.get("balance")); + //减少用户余额 + XhpcAppUser xhpcAppUser = new XhpcAppUser(); + xhpcAppUser.setAppUserId(Long.parseLong(userId)); + BigDecimal surplus1 =new BigDecimal(balance1).subtract(BigDecimal.valueOf(amount)); + xhpcAppUser.setBalance(surplus1); + xhpcUserAccountStatementMapper.updateAppUserBalance(xhpcAppUser); + } + }else{ + Map communityPersonnel = iXhpcRefundAuditService.getCommunityPersonnelById(Long.parseLong(userId), tenantId); + BigDecimal surplus1 =new BigDecimal(communityPersonnel.get("balance").toString()).subtract(BigDecimal.valueOf(amount)); + int i = iXhpcRefundAuditService.updateCommunityPersonnelMoney(Long.parseLong(userId), surplus1,null); + } refundOrder.setStatus(1); refundOrder.setRemark("支付宝退款成功"); refundOrder.setOrderId(response.getOrderId()); refundOrder.setPayFundOrderId(response.getPayFundOrderId()); refundOrder.setTransPayTime(response.getTransDate()); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,1); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,1,source,tenantId); - String balance1 = StringUtils.valueOf(appUserInfo1.get("balance")); - //减少用户余额 - XhpcAppUser xhpcAppUser = new XhpcAppUser(); - xhpcAppUser.setAppUserId(Long.parseLong(userId)); - BigDecimal surplus1 =new BigDecimal(balance1).subtract(BigDecimal.valueOf(amount)); - xhpcAppUser.setBalance(surplus1); - xhpcUserAccountStatementMapper.updateAppUserBalance(xhpcAppUser); - - } return AjaxResult.success("退款成功"); } else { System.out.println("调用失败"); @@ -588,7 +685,7 @@ public class XhpcRefundAuditController extends BaseController { } refundOrder.setStatus(2); refundOrder.setRemark("调用失败"); - updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2); + updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2,source,tenantId); return AjaxResult.error("退款失败"); } @@ -605,13 +702,12 @@ public class XhpcRefundAuditController extends BaseController { * @param phone * @param type 1成功 2失败 */ - public void updateXhpcRefundOrder(XhpcRefundOrder refundOrder,String amount,String userId,String phone,Integer type){ + public void updateXhpcRefundOrder(XhpcRefundOrder refundOrder,String amount,String userId,String phone,Integer type,Integer source,String tenantId){ iXhpcRefundOrderService.update(refundOrder); if(type ==1){ - xhpcUserAccountStatementService.add(refundOrder.getRefundOrderId(), amount, userId, StatusConstants.FLOWING_WATER_REFUND); + xhpcUserAccountStatementService.add(refundOrder.getRefundOrderId(), amount, userId, StatusConstants.FLOWING_WATER_REFUND,source,tenantId); }else{ - - xhpcUserAccountStatementService.add(refundOrder.getRefundOrderId(), amount, userId, StatusConstants.FLOWING_WATER_REFUND_ERROE); + xhpcUserAccountStatementService.add(refundOrder.getRefundOrderId(), amount, userId, StatusConstants.FLOWING_WATER_REFUND_ERROE,source,tenantId); try{ //发送短信 HashMap paramMap = new HashMap<>(); diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java index 86b29c50..cdc749ac 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java @@ -1,12 +1,18 @@ package com.xhpc.payment.controller; +import com.xhpc.common.api.UserTypeService; +import com.xhpc.common.core.annotation.NoRepeatSubmit; import com.xhpc.common.core.constant.HttpStatus; import com.xhpc.common.core.constant.StatusConstants; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.service.TokenService; +import com.xhpc.common.util.UserTypeUtil; +import com.xhpc.payment.service.IXhpcCommonPayment; import com.xhpc.payment.service.IXhpcRefundOrderService; import com.xhpc.system.api.model.LoginUser; import io.swagger.annotations.Api; @@ -30,19 +36,34 @@ public class XhpcRefundOrderController extends BaseController { private IXhpcRefundOrderService iXhpcRefundOrderService; @Autowired private TokenService tokenService; + @Autowired + private IXhpcCommonPayment xhpcCommonPayment; + @Autowired + private UserTypeService userTypeService; + /** * 申请退款 * * @return */ + @Log(title = "申请退款", businessType = BusinessType.INSERT) + @NoRepeatSubmit @PostMapping("/checkOut") @ApiOperation(value = "申请退款") - public AjaxResult enterpriseCheckOut(@RequestBody Map map) { + public AjaxResult enterpriseCheckOut(HttpServletRequest request, @RequestBody Map map) { + + LoginUser loginUser = tokenService.getLoginUser(request); + Long userid = loginUser.getUserid(); + Integer userType = loginUser.getUserType(); + String tenantId = loginUser.getTenantId(); + if (UserTypeUtil.CUSTOMERS_TYPE.equals(userType)) { + return AjaxResult.error(HttpStatus.ERROR_STATUS, "大客户不支持退款"); + } String amount = StringUtils.valueOf(map.get("amount")); if (StringUtils.isEmpty(amount)) { return AjaxResult.error(HttpStatus.NOT_NULL, "退款金额不能为空"); - }else{ - if(new BigDecimal(1).compareTo(new BigDecimal(amount))==1){ + } else { + if (new BigDecimal(1).compareTo(new BigDecimal(amount)) == 1) { return AjaxResult.error(HttpStatus.NOT_NULL, "退款金额不能少于1元"); } } @@ -60,22 +81,22 @@ public class XhpcRefundOrderController extends BaseController { if (StringUtils.isEmpty(type)) { return AjaxResult.error(HttpStatus.NOT_NULL, "退款渠道不能为空"); } - //是否有实时数据 - int i =iXhpcRefundOrderService.countXhpcRealTimeOrder(Long.valueOf(userId)); + int i = iXhpcRefundOrderService.countXhpcRealTimeOrder(userid, userType, tenantId); if (i > 0) { return AjaxResult.error(1103, "车辆正在充电,不能退款"); } // 是否有异常订单 - int j =iXhpcRefundOrderService.countXhpcChargeOrder(Long.valueOf(userId)); + int j = iXhpcRefundOrderService.countXhpcChargeOrder(userid, userType, tenantId); if (j > 0) { return AjaxResult.error(1103, "你有异常订单未解决，请拨打客服电话进行解决"); } - //生成退款订单 - String orderOutNumber = StringUtils.numFormat(Long.parseLong(userId), Integer.parseInt(type), StatusConstants.FLOWING_WATER_REFUND_TYPE); + String orderOutNumber = StringUtils.numFormat(userid, Integer.parseInt(type), + StatusConstants.FLOWING_WATER_REFUND_TYPE); String remark = StringUtils.valueOf(map.get("remark")); - return iXhpcRefundOrderService.addRefundOrder(userId, BigDecimal.valueOf(Double.parseDouble(amount)), type, orderOutNumber, openid, remark); + return iXhpcRefundOrderService.addRefundOrder("" + userid, BigDecimal.valueOf(Double.parseDouble(amount)), type, + orderOutNumber, openid, remark, userType, tenantId); } /** diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcUserAccountStatementController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcUserAccountStatementController.java index 9391edf6..78f83573 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcUserAccountStatementController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcUserAccountStatementController.java @@ -32,7 +32,6 @@ public class XhpcUserAccountStatementController extends BaseController { @ApiOperation(value = "用户流水分页列表") @GetMapping("/page") public TableDataInfo page(HttpServletRequest request) { - startPage(); List> list = iXhpcUserAccountStatementService.page(request); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcSettingConfig.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcSettingConfig.java index 6c256745..d292facd 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcSettingConfig.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcSettingConfig.java @@ -45,7 +45,7 @@ public class XhpcSettingConfig extends BaseEntity { */ private String wxTransfersUrl; /** - * 微信证书 + * 微信证书(apiclient_cert.p12) */ private String wxApiclientCertPem; /** diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRechargeOrderMapper.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRechargeOrderMapper.java index ae67f17f..a17ff624 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRechargeOrderMapper.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRechargeOrderMapper.java @@ -59,7 +59,7 @@ public interface XhpcRechargeOrderMapper { * @param createTimeEnd * @return */ - public String sumMoney(@Param("phone")String phone,@Param("rechargeOrderNumber") String rechargeOrderNumber,@Param("status") String status,@Param("createTimeStart") String createTimeStart,@Param("createTimeEnd") String createTimeEnd,@Param("type")Integer type); + public String sumMoney(@Param("phone")String phone,@Param("rechargeOrderNumber") String rechargeOrderNumber,@Param("status") String status,@Param("createTimeStart") String createTimeStart,@Param("createTimeEnd") String createTimeEnd,@Param("type")Integer type,@Param("source")Integer source,@Param("userId")Integer userId); /** diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRefundAuditMapper.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRefundAuditMapper.java index bac758d6..561098e9 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRefundAuditMapper.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRefundAuditMapper.java @@ -3,6 +3,7 @@ package com.xhpc.payment.mapper; import com.xhpc.payment.domain.XhpcRefundAudit; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -28,4 +29,10 @@ public interface XhpcRefundAuditMapper { * @return */ public List> list(@Param("refundOrderId") Long refundOrderId); + + //社区人员退款或修改 是否有退款订单审核 + int updateCommunityPersonnelMoney(@Param("communityPersonnelId")Long communityPersonnelId,@Param("surplusMoney") BigDecimal surplusMoney,@Param("isRefundApplication") Integer isRefundApplication); + + //查询社区人员信息 + Map getCommunityPersonnelById(@Param("userId")Long userId,@Param("tenantId")String tenantId); } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRefundOrderMapper.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRefundOrderMapper.java index 7c619a6c..d2501506 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRefundOrderMapper.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRefundOrderMapper.java @@ -86,7 +86,7 @@ public interface XhpcRefundOrderMapper { * @param userId 用户id * @return 结果 */ - public List> getNotChargeOrder(@Param("userId") Long userId); + public List> getNotChargeOrder(@Param("userId") Long userId,@Param("userType") Integer userType,@Param("tenantId") String tenantId); /** * 通过用户id查询未完成退款订单 @@ -100,16 +100,26 @@ public interface XhpcRefundOrderMapper { /** * 判断用户是否在充电中 */ - int countXhpcRealTimeOrder(@Param("userId")Long userId); + int countXhpcRealTimeOrder(@Param("userId")Long userId,@Param("source")Integer source,@Param("tenantId")String tenantId); /** * 判断用户是否有异常订单未处理 */ - int countXhpcChargeOrder(@Param("userId")Long userId); + int countXhpcChargeOrder(@Param("userId")Long userId,@Param("source")Integer source,@Param("tenantId")String tenantId); /** * 定时任务，每1小时，扫描一次，退款订单金额小于100，自动审核通过 */ public List moneyPage(); + + + /** + * 社区人员是否有退款订单审核（0无 1有） + * @param userId + * @param isRefundApplication + * @return + */ + int updateRefundApplication(@Param("userId")Long userId,@Param("isRefundApplication")Integer isRefundApplication); + } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRechargeOrderService.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRechargeOrderService.java index fefa9812..0c1a0c7d 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRechargeOrderService.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRechargeOrderService.java @@ -66,7 +66,7 @@ public interface IXhpcRechargeOrderService { * @param createTimeEnd * @return */ - public String sumMoney(String phone, String rechargeOrderNumber, String status, String createTimeStart, String createTimeEnd,Integer type); + public String sumMoney(String phone, String rechargeOrderNumber, String status, String createTimeStart, String createTimeEnd,Integer type,Integer source,Integer userId); /** * 新增 充值订单 diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRefundAuditService.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRefundAuditService.java index 1fa51415..e121fe50 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRefundAuditService.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRefundAuditService.java @@ -3,6 +3,7 @@ package com.xhpc.payment.service; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.payment.domain.XhpcRefundAudit; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -28,4 +29,9 @@ public interface IXhpcRefundAuditService { */ public List> list(Long refundOrderId); + //社区人员退款 + int updateCommunityPersonnelMoney(Long communityPersonnelId, BigDecimal surplusMoney,Integer isRefundApplication); + + //查询社区人员信息 + Map getCommunityPersonnelById(Long userId,String tenantId); } \ No newline at end of file diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRefundOrderService.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRefundOrderService.java index d57e7c95..251b0afc 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRefundOrderService.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRefundOrderService.java @@ -79,7 +79,7 @@ public interface IXhpcRefundOrderService { * @param remark 备注 * @return */ - public AjaxResult addRefundOrder(String appUserId, BigDecimal amount, String type, String refundOrderNumber, String openid, String remark); + public AjaxResult addRefundOrder(String appUserId, BigDecimal amount, String type, String refundOrderNumber, String openid, String remark,Integer userType,String tenantId); /** * 通过用户id查询未完成退款订单 @@ -98,16 +98,15 @@ public interface IXhpcRefundOrderService { public int updateStatus(XhpcRefundOrder xhpcRefundOrder); - //是否有正在充电的订单 /** * 判断用户是否在充电中 */ - int countXhpcRealTimeOrder(Long userId); + int countXhpcRealTimeOrder(Long userId,Integer source,String tenantId); //是否有异常订单 /** * 判断用户是否有异常订单未处理 */ - int countXhpcChargeOrder(Long userId); + int countXhpcChargeOrder(Long userId,Integer source,String tenantId); /** * 定时任务，每5分钟，扫描一次，退款订单金额小于100，自动审核通过 diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java index 106a3800..8c2a460e 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java @@ -115,9 +115,9 @@ public class XhpcRechargeOrderServiceImpl implements IXhpcRechargeOrderService { @Override - public String sumMoney(String phone, String rechargeOrderNumber, String status, String createTimeStart, String createTimeEnd, Integer type) { + public String sumMoney(String phone, String rechargeOrderNumber, String status, String createTimeStart, String createTimeEnd, Integer type,Integer source,Integer userId) { - return xhpcRechargeOrderMapper.sumMoney(phone, rechargeOrderNumber, status, createTimeStart, createTimeEnd, type); + return xhpcRechargeOrderMapper.sumMoney(phone, rechargeOrderNumber, status, createTimeStart, createTimeEnd, type,source,userId); } /** diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundAuditServiceImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundAuditServiceImpl.java index 1c8fad74..bc06a2c4 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundAuditServiceImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundAuditServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.Map; @@ -65,4 +66,14 @@ public class XhpcRefundAuditServiceImpl implements IXhpcRefundAuditService { public List> list(Long refundOrderId) { return xhpcRefundAuditMapper.list(refundOrderId); } + + @Override + public int updateCommunityPersonnelMoney(Long communityPersonnelId, BigDecimal surplusMoney,Integer isRefundApplication) { + return xhpcRefundAuditMapper.updateCommunityPersonnelMoney(communityPersonnelId, surplusMoney,isRefundApplication); + } + + @Override + public Map getCommunityPersonnelById(Long userId, String tenantId) { + return xhpcRefundAuditMapper.getCommunityPersonnelById(userId, tenantId); + } } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOrderServiceImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOrderServiceImpl.java index 4551bfe4..1a83954b 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOrderServiceImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOrderServiceImpl.java @@ -3,10 +3,13 @@ package com.xhpc.payment.service.impl; import cn.hutool.core.io.IoUtil; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; +import com.xhpc.common.api.UserTypeService; import com.xhpc.common.core.constant.HttpStatus; import com.xhpc.common.core.constant.StatusConstants; +import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.util.UserTypeUtil; import com.xhpc.payment.domain.XhpcAppUser; import com.xhpc.common.domain.XhpcRefundOrder; import com.xhpc.payment.mapper.XhpcRefundOrderMapper; @@ -36,6 +39,8 @@ public class XhpcRefundOrderServiceImpl implements IXhpcRefundOrderService { @Autowired private XhpcUserAccountStatementMapper xhpcUserAccountStatementMapper; + @Autowired + private UserTypeService userTypeService; /** * 更新 退款订单 @@ -131,12 +136,26 @@ public class XhpcRefundOrderServiceImpl implements IXhpcRefundOrderService { */ @Override @Transactional - public AjaxResult addRefundOrder(String appUserId, BigDecimal amount, String type, String refundOrderNumber, String openid, String remark) { - - List> list = xhpcRefundOrderMapper.getNotChargeOrder(Long.parseLong(appUserId)); + public AjaxResult addRefundOrder(String appUserId, BigDecimal amount, String type, String refundOrderNumber, String openid, String remark,Integer userType,String tenantId) { + long userId = Long.parseLong(appUserId); + List> list = xhpcRefundOrderMapper.getNotChargeOrder(userId,userType,tenantId); if (null != list && list.size() > 0) { return AjaxResult.error(HttpStatus.ERROR_STATUS, "还有未完成的订单"); } + R user = userTypeService.getUser(null,userId , userType, null, tenantId); + if(user !=null && user.getData() !=null){ + if(!UserTypeUtil.USER_TYPE.equals(userType) && !UserTypeUtil.COMMUNIT_TYPE.equals(userType)){ + return AjaxResult.error(HttpStatus.ERROR_STATUS, "退款失败请重新申请"); + }else if(UserTypeUtil.USER_TYPE.equals(userType)){ + XhpcAppUser xhpcAppUser = new XhpcAppUser(); + xhpcAppUser.setAppUserId(Long.parseLong(appUserId)); + xhpcAppUser.setIsRefundApplication(UserTypeUtil.REFUND_APPLICATION_ONE); + xhpcUserAccountStatementMapper.updateAppUserRefundApplication(xhpcAppUser); + }else{ + xhpcRefundOrderMapper.updateRefundApplication(userId,UserTypeUtil.REFUND_APPLICATION_ONE); + } + } + Map objectMap = xhpcUserAccountStatementMapper.appUserInfo(Long.parseLong(appUserId)); if (StringUtils.isNull(objectMap)) { return AjaxResult.error(HttpStatus.DATA_ERROR, "用户不存在"); @@ -146,21 +165,19 @@ public class XhpcRefundOrderServiceImpl implements IXhpcRefundOrderService { return AjaxResult.error(HttpStatus.DATA_ERROR, "用户已存在退款订单"); } XhpcRefundOrder xhpcRefundOrder = new XhpcRefundOrder(); - xhpcRefundOrder.setUserId(Long.parseLong(appUserId)); + xhpcRefundOrder.setUserId(userId); xhpcRefundOrder.setAmount(amount); xhpcRefundOrder.setRefundOrderNumber(refundOrderNumber); xhpcRefundOrder.setType(Integer.parseInt(type)); xhpcRefundOrder.setRemark(remark); + xhpcRefundOrder.setSource(userType); if (StatusConstants.OPERATION_WX_TYPE.equals(type)) { xhpcRefundOrder.setOpenId(openid); } else { xhpcRefundOrder.setAlipayId(openid); } xhpcRefundOrderMapper.insert(xhpcRefundOrder); - XhpcAppUser xhpcAppUser = new XhpcAppUser(); - xhpcAppUser.setAppUserId(Long.parseLong(appUserId)); - xhpcAppUser.setIsRefundApplication(1); - xhpcUserAccountStatementMapper.updateAppUserRefundApplication(xhpcAppUser); + return AjaxResult.success(); } @@ -187,13 +204,13 @@ public class XhpcRefundOrderServiceImpl implements IXhpcRefundOrderService { } @Override - public int countXhpcRealTimeOrder(Long userId) { - return xhpcRefundOrderMapper.countXhpcRealTimeOrder(userId); + public int countXhpcRealTimeOrder(Long userId,Integer source,String tenantId) { + return xhpcRefundOrderMapper.countXhpcRealTimeOrder(userId,source,tenantId); } @Override - public int countXhpcChargeOrder(Long userId) { - return xhpcRefundOrderMapper.countXhpcChargeOrder(userId); + public int countXhpcChargeOrder(Long userId,Integer source,String tenantId) { + return xhpcRefundOrderMapper.countXhpcChargeOrder(userId,source,tenantId); } @Override diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java index 25dd0c21..b81f41e0 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java @@ -4,11 +4,15 @@ import com.xhpc.common.api.UserTypeService; import com.xhpc.common.core.constant.StatusConstants; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.StringUtils; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.security.service.TokenService; +import com.xhpc.payment.controller.AlipayPaymentController; import com.xhpc.payment.domain.XhpcUserAccountStatement; import com.xhpc.payment.mapper.XhpcUserAccountStatementMapper; import com.xhpc.payment.service.IXhpcUserAccountStatementService; import com.xhpc.system.api.model.LoginUser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,7 +30,7 @@ import java.util.Map; * @author ruoyi */ @Service -public class XhpcUserAccountStatementServiceImpl implements IXhpcUserAccountStatementService { +public class XhpcUserAccountStatementServiceImpl extends BaseService implements IXhpcUserAccountStatementService { @Autowired private XhpcUserAccountStatementMapper xhpcUserAccountStatementMapper; @@ -35,7 +39,7 @@ public class XhpcUserAccountStatementServiceImpl implements IXhpcUserAccountStat @Autowired private TokenService tokenService; - + private static final Logger logger = LoggerFactory.getLogger(XhpcUserAccountStatementServiceImpl.class); /** * 新增 用户流水 * @@ -50,7 +54,7 @@ public class XhpcUserAccountStatementServiceImpl implements IXhpcUserAccountStat /** * 用户流水分页列表 * - * @param appUserId C端用户id + * @param C端用户id * @return */ @Override @@ -63,12 +67,12 @@ public class XhpcUserAccountStatementServiceImpl implements IXhpcUserAccountStat R user = userTypeService.getUser(null, userid, userType, null, tenantId); if(user !=null && user.getData() !=null){ Map userMessage = (Map)user.getData(); - if (userMessage == null) { + if (userMessage != null) { + startPage(); return xhpcUserAccountStatementMapper.page(userid,userType,tenantId); } } return list; - //return xhpcUserAccountStatementMapper.page(appUserId); } /** @@ -79,7 +83,7 @@ public class XhpcUserAccountStatementServiceImpl implements IXhpcUserAccountStat * @param userId 用户id * @param type 操作类型（1充值 2退款 3充电） */ - public void add(Long id, String amount, String userId, Integer type) { + public void add(Long id, String amount, String userId, Integer type,Integer source,String tenantId) { XhpcUserAccountStatement xhpcUserAccountStatement = new XhpcUserAccountStatement(); xhpcUserAccountStatement.setAmount(BigDecimal.valueOf(Double.valueOf(amount))); if (StatusConstants.FLOWING_WATER_RECHARGE == type) { @@ -91,6 +95,8 @@ public class XhpcUserAccountStatementServiceImpl implements IXhpcUserAccountStat } xhpcUserAccountStatement.setUserId(Long.parseLong(userId)); xhpcUserAccountStatement.setType(type); + xhpcUserAccountStatement.setSource(source); + xhpcUserAccountStatement.setTenantId(tenantId); Map appUserInfo = xhpcUserAccountStatementMapper.appUserInfo(Long.parseLong(userId)); if (StringUtils.isNotNull(appUserInfo)) { String balance = StringUtils.valueOf(appUserInfo.get("balance")); @@ -111,7 +117,7 @@ public class XhpcUserAccountStatementServiceImpl implements IXhpcUserAccountStat /** * 用户流水列表 * - * @param appUserId C端用户id + * @param C端用户id * @return */ @Override @@ -125,7 +131,7 @@ public class XhpcUserAccountStatementServiceImpl implements IXhpcUserAccountStat R user = userTypeService.getUser(null, userid, userType, null, tenantId); if(user !=null && user.getData() !=null){ Map userMessage = (Map)user.getData(); - if (userMessage == null) { + if (userMessage != null) { return xhpcUserAccountStatementMapper.list(userid,userType,tenantId); } } diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml index 65890bde..97b2d8ec 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml @@ -201,7 +201,7 @@ AND xro.type = #{type} - and xro.userId=#{userId} + and xro.user_id=#{userId} ORDER BY xro.create_time DESC @@ -230,6 +230,12 @@ AND xro.type = #{type} + + AND xro.source = #{source} + + + and xro.user_id=#{userId} + ORDER BY xro.create_time DESC diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundAuditMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundAuditMapper.xml index 0b78d504..b747274e 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundAuditMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundAuditMapper.xml @@ -90,4 +90,38 @@ ORDER BY xra.create_time DESC + + + + UPDATE xhpc_community_personnel + + surplus_money = #{surplusMoney}, + is_refund_application = #{isRefundApplication}, + + WHERE community_personnel_id = #{communityPersonnelId} + + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml index 99a16e8e..d3d5154b 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml @@ -171,7 +171,7 @@ @@ -302,11 +308,31 @@ + + + UPDATE xhpc_community_personnel set is_refund_application=#{isRefundApplication} where community_personnel_id=#{userId} + \ No newline at end of file diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml index ce2dd28a..9a6cdc92 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml @@ -69,7 +69,10 @@ remark, - source + source, + + + tenant_id @@ -116,7 +119,10 @@ #{remark}, - #{source} + #{source}, + + + #{tenantId}, @@ -133,10 +139,10 @@ and xau.app_user_id = #{appUserId} - and xau.tenant_id = #{tenantId} + and xuas.tenant_id = #{tenantId} - and xau.source = #{source} + and xuas.source = #{source} ORDER BY xuas.create_time DESC @@ -182,10 +188,10 @@ and xau.app_user_id = #{appUserId} - and xau.tenant_id = #{tenantId} + and xuas.tenant_id = #{tenantId} - and xau.source = #{source} + and xuas.source = #{source} ORDER BY xuas.create_time DESC diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/mapper/XhpcDeviceMessageMapper.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/mapper/XhpcDeviceMessageMapper.java similarity index 90% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/mapper/XhpcDeviceMessageMapper.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/mapper/XhpcDeviceMessageMapper.java index a0f2fb54..382e89e2 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/mapper/XhpcDeviceMessageMapper.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/mapper/XhpcDeviceMessageMapper.java @@ -1,4 +1,4 @@ -package com.xhpc.pp.mapper; +package com.xhpc.mapper; import com.xhpc.pp.domain.XhpcDeviceMessage; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java index adf450b4..cc720066 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java @@ -11,7 +11,7 @@ import com.xhpc.common.data.down.StartChargingData; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; import com.xhpc.pp.logic.RateModelRequestLogic; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.server.ChargingPileServer; import com.xhpc.pp.utils.HexUtils; import com.xhpc.pp.utils.security.CRCCalculator; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java index 7f35d596..b3881863 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java @@ -8,18 +8,41 @@ import java.util.Date; @Data public class XhpcDeviceMessage { + /** + * 消息ID + */ private Long deviceMessageId; + /** + * 设备类型 + */ private String type; + /** + * 设备编码 + */ private String serialNumber; + /** + * 充电订单号 + */ + private String chargeOrderNo; + + /** + * 报文内容 + */ private String content; - private String replyContent; - + /** + * 状态 + */ private Integer status; + /** + * 备注描述 + */ + private String remark; + private Date createTime; private String createBy; @@ -28,5 +51,4 @@ public class XhpcDeviceMessage { private String updateBy; - private String remark; } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java index ba79e1ae..d74e45fe 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.BalanceUpdateReplyData; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java index 5b10bc89..f91f8a46 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java @@ -1,16 +1,13 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -22,8 +19,7 @@ import java.util.Map; public class BmsChargerInterruptDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsChargerInterruptDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; + @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -31,18 +27,13 @@ public class BmsChargerInterruptDataLogic implements ServiceLogic { public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 充电阶段充电机中止报文"; Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); - XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); deviceMessage.setSerialNumber(sp.getPileNo()); deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java index 8920327f..d177fa96 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java @@ -1,16 +1,13 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -22,8 +19,6 @@ import java.util.Map; public class BmsChargingCompletedDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsChargingCompletedDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -32,12 +27,6 @@ public class BmsChargingCompletedDataLogic implements ServiceLogic { public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 充电结束阶段报文"; Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); - XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -45,6 +34,7 @@ public class BmsChargingCompletedDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java index a8107214..940825ac 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java @@ -1,16 +1,13 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -22,8 +19,6 @@ import java.util.Map; public class BmsChargingConfigDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsChargingConfigDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -33,11 +28,6 @@ public class BmsChargingConfigDataLogic implements ServiceLogic { String remark = "充电桩与 BMS 参数配置阶段报文"; Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -45,6 +35,7 @@ public class BmsChargingConfigDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java index 2760eab0..2976e2bb 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java @@ -1,16 +1,17 @@ package com.xhpc.pp.logic; -import com.xhpc.mapper.XhpcMessageMapper; -import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -18,18 +19,23 @@ import java.util.Map; public class BmsChargingDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsChargingDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; @Override public ServiceResult service(ServiceParameter sp) throws Exception { Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark("充电桩与 BMS 充电过程 BMS 信息"); - xhpcMessageMapper.insertItemsBy(msg); + + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark("充电桩与 BMS 充电过程 BMS 信息"); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java index 6b25ec30..18c70ce9 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java @@ -1,16 +1,13 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -22,8 +19,6 @@ import java.util.Map; public class BmsChargingHandshakeDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsChargingHandshakeDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -33,11 +28,6 @@ public class BmsChargingHandshakeDataLogic implements ServiceLogic { String remark = "充电桩与 BMS 充电握手阶段报文"; Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -45,6 +35,7 @@ public class BmsChargingHandshakeDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java index c335450d..71b22460 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java @@ -1,16 +1,13 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -22,8 +19,7 @@ import java.util.Map; public class BmsErrorDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsErrorDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; + @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -31,11 +27,6 @@ public class BmsErrorDataLogic implements ServiceLogic { public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 充电错误报文"; Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -43,6 +34,8 @@ public class BmsErrorDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); + deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java index 568f7af9..715cefd6 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java @@ -1,16 +1,13 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -22,8 +19,7 @@ import java.util.Map; public class BmsInterruptDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsInterruptDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; + @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -31,11 +27,6 @@ public class BmsInterruptDataLogic implements ServiceLogic { public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 充电阶段 BMS 中止报文"; Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -43,6 +34,8 @@ public class BmsInterruptDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); + deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java index dafb9b36..f5a0e61c 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java @@ -1,16 +1,17 @@ package com.xhpc.pp.logic; -import com.xhpc.mapper.XhpcMessageMapper; -import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -18,18 +19,23 @@ import java.util.Map; public class BmsReqChargerOutputDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsReqChargerOutputDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; @Override public ServiceResult service(ServiceParameter sp) throws Exception { Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark("充电桩与 BMS 充电过程 BMS 需求、充电机输出"); - xhpcMessageMapper.insertItemsBy(msg); + + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark("充电桩与 BMS 充电过程 BMS 需求、充电机输出"); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java index bb063596..31912978 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java @@ -2,7 +2,7 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java index 35cc7aac..784ce841 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java @@ -2,7 +2,7 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java index 58722743..1b7fd7da 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.OfflineCardSyncReplyData; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java index b39a30b0..211316da 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java @@ -30,6 +30,7 @@ import static com.xhpc.pp.utils.security.CacheDataUtils.reflectTranslate; public class OrderDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(OrderDataLogic.class); + @Autowired private PileOrderService pileOrderService; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java index 26ea5a1d..09a34622 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.PileConfigReplyData; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java index d6b0b655..6ffe0846 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.PileStartChargingData; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java index 8f3c89a0..b4b91e62 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.PileTimeConfigReplyData; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java index ba98ca30..5065694e 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java @@ -5,7 +5,7 @@ import com.xhpc.common.api.dto.ChargingStationDto; import com.xhpc.common.data.up.PileConfigReplyData; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -55,7 +55,6 @@ public class RateModelConfigReplyDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); - deviceMessage.setReplyContent(result); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(result); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java index 3a1a6f0d..97875b0d 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java @@ -6,7 +6,7 @@ import com.xhpc.common.api.dto.ChargingStationDto; import com.xhpc.common.data.redis.CacheRateModel; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -56,7 +56,6 @@ public class RateModelRequestLogic implements ServiceLogic { deviceMessage.setRemark("充电桩计费模型请求"); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); - deviceMessage.setReplyContent(resultStr); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java index 236272b0..bcf50f03 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java @@ -3,7 +3,7 @@ package com.xhpc.pp.logic; import com.xhpc.common.api.dto.ChargingStationDto; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -72,7 +72,6 @@ public class RateModelValidateLogic implements ServiceLogic { deviceMessage.setRemark("计费模型验证请求"); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); - deviceMessage.setReplyContent(resultStr); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(HexUtils.toBytes(resultStr), resultCode); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java index f9205cb8..252c3af4 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java @@ -3,7 +3,7 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.evcs.dto.ConnectorStatusInfo; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -91,7 +91,6 @@ public class RegisterLogic implements ServiceLogic { deviceMessage.setRemark("充电桩登录认证"); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); - deviceMessage.setReplyContent(resultStr); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(HexUtils.toBytes(resultStr), resultCode); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java index 12137040..808bc2b5 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.PileConfigReplyData; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java index e28856fa..0c3c4376 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.PileConfigReplyData; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java index 0546455d..70e23b88 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java @@ -3,7 +3,10 @@ package com.xhpc.pp.server; import cn.hutool.core.date.DateUtil; import com.alibaba.nacos.api.exception.NacosException; import com.xhpc.common.api.dto.ChargingStationDto; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.domain.ServiceField; +import com.xhpc.pp.domain.XhpcDeviceMessage; import com.xhpc.pp.logic.FieldLogic; import com.xhpc.pp.logic.ServiceMainLogic; import com.xhpc.pp.tx.ServiceParameter; @@ -47,11 +50,13 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { // private static final String DATA_TYPE_HEX = "hex"; private final ServiceMainLogic servicemainLogic; + private final XhpcDeviceMessageMapper xhpcDeviceMessageMapper; public ChargingPileBinaryHandler() { servicemainLogic = SpringContextHolder.getBean("ServiceMainLogic"); + xhpcDeviceMessageMapper = SpringContextHolder.getBean(XhpcDeviceMessageMapper.class); } @Override @@ -115,6 +120,14 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { } else { log.debug("server send msg >>>> ({}) |{}|", pileNo, toHex(result.getBinary())); handler.sendClientBinary(result.getBinary()); + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark("平台下发/回复充电桩"); + deviceMessage.setStatus(0); + deviceMessage.setContent(HexUtils.toString(result.getBinary())); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); + xhpcDeviceMessageMapper.insertByDomain(deviceMessage); } if (SERVICE_HB.equals(serviceName) && OK.equals(resultCode)) { Boolean tcfg = (Boolean) cachePile.get("tcfg"); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java index 6fc1d521..f371b1c9 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; +import com.xhpc.mapper.XhpcDeviceMessageMapper; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java index 97b5e6b9..779ab9f1 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java @@ -40,6 +40,8 @@ public class CacheDataUtils { } } else if (tarFieldName.contains("ime")) { tarval = DateUtil.format(cp56toDate(srcval), NORM_DATETIME_FORMAT); + } else if (tarFieldName.startsWith("vin")) { + tarval = HexUtils.toAscii(srcval); } else { tarval = srcval; } diff --git a/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml b/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml index e454c7c6..9f546975 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml +++ b/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -1,14 +1,14 @@ - + - + @@ -19,10 +19,11 @@ insert into xhpc_device_message( - type, + + type, serial_number, content, - reply_content, + charge_order_no, status, create_by, remark, @@ -30,10 +31,10 @@ create_time, update_time )values( - #{type}, + #{type}, #{serialNumber}, #{content}, - #{replyContent}, + #{chargeOrderNo}, #{status}, #{createBy}, #{remark}, diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java index 146449dc..0a7ed380 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java @@ -73,7 +73,6 @@ public class XhpcAppUserController extends BaseController { //@PreAuthorize(hasPermi = "app:user:page") @GetMapping("/page") public TableDataInfo page(HttpServletRequest request,String phone) { - startPage(); List> list = iXhpcAppUserUserService.selectAppUserList(request,phone); return getDataTable(list); } @@ -286,8 +285,8 @@ public class XhpcAppUserController extends BaseController { */ @ApiOperation("注销账号") @PostMapping("/logout") - public R logout(String phone, String code) { - return iXhpcAppUserUserService.logout(phone, code); + public R logout(HttpServletRequest request,String phone, String code) { + return iXhpcAppUserUserService.logout(request,phone, code); } @@ -315,7 +314,6 @@ public class XhpcAppUserController extends BaseController { @PostMapping("/batteryProtect") public R batteryProtect(HttpServletRequest request,@RequestBody Map map) { if(map !=null){ - Integer soc = Integer.parseInt(map.get("soc").toString()); Integer socProtect = Integer.parseInt(map.get("socProtect").toString()); Integer userType = Integer.parseInt(map.get("userType").toString()); diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCommunityController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCommunityController.java index 8accd938..9f16aa45 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCommunityController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCommunityController.java @@ -11,6 +11,7 @@ import com.xhpc.user.service.IXhpcCommunityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -29,9 +30,8 @@ public class XhpcCommunityController extends BaseController { * 社区组树列表 */ @GetMapping("/list") - public TableDataInfo list(String name) { - startPage(); - List> list = xhpcCommunityService.list(name); + public TableDataInfo list(HttpServletRequest request, String name) { + List> list = xhpcCommunityService.list(request,name); return getDataTable(list); } @@ -49,6 +49,7 @@ public class XhpcCommunityController extends BaseController { /** * 删除社区组树 */ + @Log(title = "社区", businessType = BusinessType.DELETE) @PostMapping(value = "/deleteCommunity") public AjaxResult deleteCommunity(@RequestBody XhpcCommunity xhpcCommunity) { return xhpcCommunityService.deleteCommunity(xhpcCommunity); @@ -67,6 +68,7 @@ public class XhpcCommunityController extends BaseController { * * @return */ + @Log(title = "社区", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateCommunity") public AjaxResult updateCommunity(@RequestBody XhpcCommunity xhpcCommunity) { return xhpcCommunityService.updateCommunity(xhpcCommunity); @@ -89,6 +91,7 @@ public class XhpcCommunityController extends BaseController { * 社区人员添加 * */ + @Log(title = "社区人员", businessType = BusinessType.INSERT) @PostMapping(value = "/addCommunityPersonnel") public AjaxResult addCommunityPersonnel(@RequestBody XhpcCommunityPersonnel xhpcCommunityPersonnel) { return xhpcCommunityService.addCommunityPersonnel(xhpcCommunityPersonnel); @@ -107,6 +110,7 @@ public class XhpcCommunityController extends BaseController { * 编辑社区人员 * */ + @Log(title = "社区人员", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateCommunityPersonnel") public AjaxResult updateCommunityPersonnel(@RequestBody XhpcCommunityPersonnel xhpcCommunityPersonnel) { return xhpcCommunityService.updateCommunityPersonnel(xhpcCommunityPersonnel); @@ -115,6 +119,7 @@ public class XhpcCommunityController extends BaseController { /** * 删除社区人员 */ + @Log(title = "社区人员", businessType = BusinessType.DELETE) @PostMapping(value = "/deleteCommunityPersonnel") public AjaxResult deleteCommunityPersonnel(@RequestBody XhpcCommunityPersonnel xhpcCommunityPersonnel) { xhpcCommunityService.deleteCommunityPersonnel(xhpcCommunityPersonnel); @@ -124,6 +129,7 @@ public class XhpcCommunityController extends BaseController { /** * 改变社区人员状态 */ + @Log(title = "社区人员-状态", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateCommunityPersonnelStatus") public AjaxResult updateCommunityPersonnelStatus(@RequestBody XhpcCommunityPersonnel xhpcCommunityPersonnel) { xhpcCommunityService.updateCommunityPersonnelStatus(xhpcCommunityPersonnel); @@ -133,6 +139,7 @@ public class XhpcCommunityController extends BaseController { /** * 充值 */ + @Log(title = "社区人员-充值", businessType = BusinessType.INSERT) @PostMapping(value = "/addRecharge") public AjaxResult addRecharge(@RequestBody XhpcCommunityPersonnel xhpcCommunityPersonnel) { return xhpcCommunityService.addRecharge(xhpcCommunityPersonnel); diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCustomersController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCustomersController.java index a372f622..b36c2cb4 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCustomersController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCustomersController.java @@ -3,6 +3,8 @@ package com.xhpc.user.controller; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.user.domain.XhpcCustomers; import com.xhpc.user.domain.XhpcCustomersPersonnel; import com.xhpc.user.service.IXhpcCustomersService; @@ -29,9 +31,8 @@ public class XhpcCustomersController extends BaseController { * 大客户组树列表 */ @GetMapping("/list") - public TableDataInfo list(String name) { - startPage(); - List> list = xhpcCustomersService.list(name); + public TableDataInfo list(HttpServletRequest request,String name) { + List> list = xhpcCustomersService.list(request,name); return getDataTable(list); } @@ -40,6 +41,7 @@ public class XhpcCustomersController extends BaseController { * * @return */ + @Log(title = "大客户组", businessType = BusinessType.INSERT) @PostMapping(value = "/addCustomers") public AjaxResult addCustomers(HttpServletRequest request, @RequestBody XhpcCustomers xhpcCustomers) { return xhpcCustomersService.addCustomers(request,xhpcCustomers); @@ -48,6 +50,7 @@ public class XhpcCustomersController extends BaseController { /** * 删除大客户 */ + @Log(title = "大客户组", businessType = BusinessType.DELETE) @PostMapping(value = "/deleteCustomers") public AjaxResult deleteCustomers(@RequestBody XhpcCustomers xhpcCustomers) { return xhpcCustomersService.deleteCustomers(xhpcCustomers); @@ -66,6 +69,7 @@ public class XhpcCustomersController extends BaseController { * * @return */ + @Log(title = "大客户组", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateCustomers") public AjaxResult updateCustomers(@RequestBody XhpcCustomers xhpcCustomers) { return xhpcCustomersService.updateCustomers(xhpcCustomers); @@ -84,6 +88,7 @@ public class XhpcCustomersController extends BaseController { * 大客户人员添加 * */ + @Log(title = "大客户人员", businessType = BusinessType.INSERT) @PostMapping(value = "/addCustomersPersonnel") public AjaxResult addCustomersPersonnel(@RequestBody XhpcCustomersPersonnel xhpcCustomersPersonnel) { return xhpcCustomersService.addCustomersPersonnel(xhpcCustomersPersonnel); @@ -102,6 +107,7 @@ public class XhpcCustomersController extends BaseController { * 编辑大客户人员 * */ + @Log(title = "大客户人员", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateCustomersPersonnel") public AjaxResult updateCustomersPersonnel(@RequestBody XhpcCustomersPersonnel xhpcCustomersPersonnel) { return xhpcCustomersService.updateCustomersPersonnel(xhpcCustomersPersonnel); @@ -110,6 +116,7 @@ public class XhpcCustomersController extends BaseController { /** * 删除社区人员 */ + @Log(title = "大客户人员", businessType = BusinessType.DELETE) @PostMapping(value = "/deleteCustomersPersonnel") public AjaxResult deleteCustomersPersonnel(@RequestBody XhpcCustomersPersonnel xhpcCustomersPersonnel) { xhpcCustomersService.deleteCustomersPersonnel(xhpcCustomersPersonnel); @@ -119,6 +126,7 @@ public class XhpcCustomersController extends BaseController { /** * 充值 */ + @Log(title = "大客户人员-充值", businessType = BusinessType.INSERT) @PostMapping(value = "/addRecharge") public AjaxResult addRecharge(@RequestBody XhpcCustomersPersonnel xhpcCustomersPersonnel) { return xhpcCustomersService.addRecharge(xhpcCustomersPersonnel); @@ -127,6 +135,7 @@ public class XhpcCustomersController extends BaseController { /** * 改变社区人员状态 */ + @Log(title = "大客户人员-状态", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateCustomersPersonnelStatus") public AjaxResult updateCustomersPersonnelStatus(@RequestBody XhpcCustomersPersonnel xhpcCustomersPersonnel) { xhpcCustomersService.updateCustomersPersonnelStatus(xhpcCustomersPersonnel); diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java index 55e7aa99..530a4432 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java @@ -8,6 +8,8 @@ import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.annotation.PreAuthorize; import com.xhpc.system.api.domain.SysUser; import com.xhpc.user.domain.XhpcInternetUser; @@ -43,6 +45,7 @@ public class XhpcInternetUserController extends BaseController { /** * 新增流量用户 */ + @Log(title = "流量用户", businessType = BusinessType.INSERT) @ApiOperation("新增流量用户") @RequiresRoles("admin") @PostMapping("/add") @@ -81,6 +84,7 @@ public class XhpcInternetUserController extends BaseController { /** * 修改流量用户 */ + @Log(title = "流量用户", businessType = BusinessType.UPDATE) @ApiOperation("修改流量用户") @RequiresRoles("admin") @PostMapping("/edit") @@ -118,6 +122,7 @@ public class XhpcInternetUserController extends BaseController { /** * 删除流量用户 */ + @Log(title = "流量用户", businessType = BusinessType.DELETE) @ApiOperation("删除流量用户") @RequiresRoles("admin") @PostMapping("/remove") @@ -154,6 +159,7 @@ public class XhpcInternetUserController extends BaseController { /** * 禁用/启用流量用户 */ + @Log(title = "流量用户-禁用启用", businessType = BusinessType.UPDATE) @ApiOperation("禁用/启用流量用户") @RequiresRoles("admin") @PostMapping("/status") @@ -173,6 +179,7 @@ public class XhpcInternetUserController extends BaseController { //@PreAuthorize(hasPermi = "user:internet:list") @GetMapping("/list") public TableDataInfo list(String name) { + startPage(); List> list = iXhpcInternetUserService.list(name); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java index e3cfe8b1..5a3e9b1e 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java @@ -7,6 +7,8 @@ import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.annotation.PreAuthorize; import com.xhpc.system.api.domain.SysUser; import com.xhpc.user.domain.XhpcOperator; @@ -40,6 +42,7 @@ public class XhpcOperatorController extends BaseController { /** * 新增运营商 */ + @Log(title = "运营商", businessType = BusinessType.INSERT) @ApiOperation("新增运营商") @RequiresRoles("admin") @PostMapping("/add") @@ -101,6 +104,7 @@ public class XhpcOperatorController extends BaseController { /** * 修改运营商 */ + @Log(title = "运营商", businessType = BusinessType.UPDATE) @ApiOperation("修改运营商") @PreAuthorize(hasPermi = "user:operator:edit") @RequiresRoles("admin") @@ -121,6 +125,7 @@ public class XhpcOperatorController extends BaseController { /** * 删除运营商 */ + @Log(title = "运营商", businessType = BusinessType.DELETE) @ApiOperation("删除运营商") @RequiresRoles("admin") @PostMapping("/remove") @@ -157,6 +162,7 @@ public class XhpcOperatorController extends BaseController { /** * 禁用/启用运营商 */ + @Log(title = "运营商-禁用启用", businessType = BusinessType.UPDATE) @ApiOperation("禁用/启用运营商") @RequiresRoles("admin") @PostMapping("/status") diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java index ef090e2f..924051c7 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java @@ -3,6 +3,8 @@ package com.xhpc.user.controller; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.user.domain.XhpcOperatorInternetBlacklist; import com.xhpc.user.service.IXhpcOperatorInternetBlacklistService; import io.swagger.annotations.ApiOperation; @@ -28,6 +30,7 @@ public class XhpcOperatorInternetBlacklistController extends BaseController { /** * 新增运营商设置流量方黑名单 */ + @Log(title = "运营商-设置流量方黑名单", businessType = BusinessType.INSERT) @ApiOperation("新增运营商设置流量方黑名单") //@PreAuthorize(hasPermi = "operator:internet:add") @PostMapping("/add") @@ -49,6 +52,7 @@ public class XhpcOperatorInternetBlacklistController extends BaseController { //@PreAuthorize(hasPermi = "operator:internet:list") @GetMapping("/list") public TableDataInfo list(@RequestParam String operatorId) { + startPage(); List> list = xhpcOperatorInternetBlacklistService.list(operatorId); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java index cc6dd9f7..a81417db 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java @@ -3,6 +3,8 @@ package com.xhpc.user.controller; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.user.domain.XhpcStationInternetBlacklist; import com.xhpc.user.service.IXhpcInternetUserService; import com.xhpc.user.service.IXhpcStationInternetBlacklistService; @@ -32,6 +34,7 @@ public class XhpcStationInternetBlacklistController extends BaseController { /** * 新增电站流量方黑名单 */ + @Log(title = "场站-设置流量方黑名单", businessType = BusinessType.INSERT) @ApiOperation("新增电站流量方黑名单") // @PreAuthorize(hasPermi = "station:internet:add") @PostMapping("/add") @@ -59,16 +62,15 @@ public class XhpcStationInternetBlacklistController extends BaseController { //@PreAuthorize(hasPermi = "station:internet:list") @GetMapping("/list") public TableDataInfo list(@RequestParam String internetUserId) { + startPage(); List> list = iXhpcStationInternetBlacklistService.list(internetUserId); return getDataTable(list); } @GetMapping("/list1") public TableDataInfo list1(@RequestParam String internetUserId) { + startPage(); List> list = iXhpcStationInternetBlacklistService.list(internetUserId); - - - return getDataTable(list); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java index 500de840..9a07b170 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java @@ -7,6 +7,8 @@ import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.annotation.PreAuthorize; import com.xhpc.system.api.domain.SysRole; import com.xhpc.system.api.domain.SysUser; @@ -52,6 +54,7 @@ public class XhpcUserController extends BaseController { /** * 新增平台用户 */ + @Log(title = "平台用户", businessType = BusinessType.INSERT) @ApiOperation("新增平台用户") @RequiresRoles("admin") @PostMapping("/pc/add") @@ -82,6 +85,7 @@ public class XhpcUserController extends BaseController { /** * 修改平台用户 */ + @Log(title = "平台用户", businessType = BusinessType.UPDATE) @ApiOperation("修改平台用户") @RequiresRoles("admin") @PostMapping("/pc/edit") @@ -115,7 +119,6 @@ public class XhpcUserController extends BaseController { //@PreAuthorize(hasPermi = "user:operator:page") @GetMapping("/operator/page") public TableDataInfo operatorPage(String userName, String nickName, Long operatorId) { - startPage(); List> list = iXhpcUserService.selectOperatorUserList(userName, nickName, operatorId); return getDataTable(list); } @@ -123,6 +126,7 @@ public class XhpcUserController extends BaseController { /** * 新增运营商用户 */ + @Log(title = "运营商用户", businessType = BusinessType.INSERT) @ApiOperation("新增运营商用户") @RequiresPermissions("user:operator:add") @PostMapping("/operator/add") @@ -155,6 +159,7 @@ public class XhpcUserController extends BaseController { /** * 修改运营商用户 */ + @Log(title = "运营商用户", businessType = BusinessType.UPDATE) @ApiOperation("修改运营商用户") @RequiresPermissions("user:operator:edit") @PostMapping("/operator/edit") @@ -182,6 +187,7 @@ public class XhpcUserController extends BaseController { /** * 禁用/启用平台和运营商子账号 */ + @Log(title = "平台和运营商子账号-禁用启用", businessType = BusinessType.UPDATE) @ApiOperation("禁用/启用平台和运营商子账号") //@PreAuthorize(hasPermi = "user:pc:status") @PostMapping("/status") @@ -197,6 +203,7 @@ public class XhpcUserController extends BaseController { /** * 禁用/启用平台和运营商子账号 */ + @Log(title = "平台和运营商子账号-禁用启用", businessType = BusinessType.UPDATE) @ApiOperation("禁用/启用平台和运营商子账号") //@PreAuthorize(hasPermi = "user:pc:status") @PostMapping("/remove") @@ -213,6 +220,7 @@ public class XhpcUserController extends BaseController { /** * 重置密码 */ + @Log(title = "重置密码", businessType = BusinessType.UPDATE) @PostMapping("/reset") public AjaxResult reset(@RequestParam Long userId){ diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java index 6d28be21..3e5085af 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java @@ -3,6 +3,7 @@ package com.xhpc.user.mapper; import com.xhpc.user.domain.XhpcAppUser; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -81,7 +82,7 @@ public interface XhpcAppUserMapper { /** * 记录登录用户的最后一次数据 */ - int addUserLoginTime(@Param("appUserId")Long appUserId, @Param("account")String account, @Param("userType")Integer userType, @Param("openId")String openId,@Param("type")Integer type,@Param("status")Integer status,@Param("tenantId")String tenantId); + int addUserLoginTime(@Param("appUserId")Long appUserId, @Param("account")String account, @Param("userType")Integer userType, @Param("openId")String openId, @Param("type")Integer type, @Param("status")Integer status, @Param("tenantId")String tenantId, @Param("createTime") Date createTime); /** * 修改社区用户信息 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCommunityMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCommunityMapper.java index b65c810d..2b64041f 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCommunityMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCommunityMapper.java @@ -20,7 +20,7 @@ public interface XhpcCommunityMapper { * @param name 桩名称 * @return */ - List> list(@Param("name") String name); + List> list(@Param("name") String name,@Param("tenantId") String tenantId); /** * 添加社区组 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCustomersMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCustomersMapper.java index d758e985..5fef93b9 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCustomersMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCustomersMapper.java @@ -25,7 +25,7 @@ public interface XhpcCustomersMapper { * @param name 桩名称 * @return */ - List> list(@Param("name") String name,@Param("operatorId") Long operatorId); + List> list(@Param("name") String name,@Param("operatorId") Long operatorId,@Param("tenantId") String tenantId); /** * 查询大客户组 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcAppUserUserService.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcAppUserUserService.java index 42812998..32c75c39 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcAppUserUserService.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcAppUserUserService.java @@ -97,7 +97,7 @@ public interface IXhpcAppUserUserService { * @param code * @return */ - public R logout(String phone, String code); + public R logout(HttpServletRequest request,String phone, String code); /** * 设置小程序用户自动退款功能 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCommunityService.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCommunityService.java index f1a12a81..11a5ab2c 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCommunityService.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCommunityService.java @@ -5,6 +5,7 @@ import com.xhpc.common.domain.XhpcChargingPile; import com.xhpc.user.domain.XhpcCommunity; import com.xhpc.user.domain.XhpcCommunityPersonnel; +import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -21,7 +22,7 @@ public interface IXhpcCommunityService { * @param name 桩名称 * @return */ - List> list(String name); + List> list(HttpServletRequest request, String name); /** * 新增社区组树 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCustomersService.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCustomersService.java index a55526bc..d30fdaea 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCustomersService.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCustomersService.java @@ -21,7 +21,7 @@ public interface IXhpcCustomersService { * @param name 桩名称 * @return */ - List> list(String name); + List> list(HttpServletRequest request,String name); /** * 新增大客户组树 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java index d527c3c7..a700e5eb 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java @@ -11,6 +11,7 @@ import com.xhpc.common.core.enums.UserStatus; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; @@ -37,7 +38,7 @@ import java.util.Map; * @author ruoyi */ @Service -public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { +public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserUserService { @Autowired private XhpcAppUserMapper xhpcAppUserMapper; @@ -88,7 +89,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { @Override public List> selectAppUserList(HttpServletRequest request,String phone) { LoginUser logUser = logUserUtils.getLogUser(request); - + startPage(); return xhpcAppUserMapper.selectAppUserList(phone,logUser.getTenantId()); } @@ -162,7 +163,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { } } //添加最后一次登录数据 - xhpcAppUserMapper.addUserLoginTime(info.getAppUserId(),info.getPhone(),UserTypeUtil.USER_TYPE,openid,Integer.valueOf(type),null,tenantId); + xhpcAppUserMapper.addUserLoginTime(info.getAppUserId(),info.getPhone(),UserTypeUtil.USER_TYPE,openid,Integer.valueOf(type),null,tenantId,new Date()); return R.fail(HttpStatus.ALREADY_EXISTING, "账号已存在"); } XhpcAppUser xhpcAppUser = new XhpcAppUser(); @@ -259,7 +260,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { } } //添加最后一次登录数据 - xhpcAppUserMapper.addUserLoginTime(appUserId,username,userInfo.getUserType(),openid,Integer.valueOf(type),null,tenantId); + xhpcAppUserMapper.addUserLoginTime(appUserId,username,userInfo.getUserType(),openid,Integer.valueOf(type),null,tenantId,new Date()); redisService.deleteObject("pvToken:" + username); // 获取登录token @@ -323,7 +324,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { redisService.deleteObject("pvToken:" + user.getPhone()); //添加最后一次登录数据 - xhpcAppUserMapper.addUserLoginTime(user.getAppUserId(),username,userInfo.getUserType(),openid,Integer.valueOf(type),UserConstants.LOGIN,tenantId); + xhpcAppUserMapper.addUserLoginTime(user.getAppUserId(),username,userInfo.getUserType(),openid,Integer.valueOf(type),UserConstants.LOGIN,tenantId,new Date()); // 获取登录token return R.ok(tokenService.createToken(userInfo)); } @@ -356,7 +357,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { } xhpcAppUserMapper.update(appUser); //添加最后一次登录数据 - xhpcAppUserMapper.addUserLoginTime(appUser.getAppUserId(),username,userType,openId,Integer.valueOf(type),UserConstants.NO_LOGIN,tenantId); + xhpcAppUserMapper.addUserLoginTime(appUser.getAppUserId(),username,userType,openId,Integer.valueOf(type),UserConstants.NO_LOGIN,tenantId,new Date()); } }else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){ if (StatusConstants.OPERATION_WX_TYPE.equals(type)) { @@ -365,7 +366,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { xhpcAppUserMapper.updateCommunityPersonnel(userid,null,null,null,UserConstants.NO_LOGIN); } //添加最后一次登录数据 - xhpcAppUserMapper.addUserLoginTime(userid,username,userType,openId,Integer.valueOf(type),UserConstants.NO_LOGIN,tenantId); + xhpcAppUserMapper.addUserLoginTime(userid,username,userType,openId,Integer.valueOf(type),UserConstants.NO_LOGIN,tenantId,new Date()); }else if(UserTypeUtil.CUSTOMERS_TYPE.equals(userType)){ if (StatusConstants.OPERATION_WX_TYPE.equals(type)) { xhpcAppUserMapper.updateCustomersPersonnel(userid,null,null,UserConstants.NO_LOGIN,null); @@ -373,7 +374,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { xhpcAppUserMapper.updateCustomersPersonnel(userid,null,null,null,UserConstants.NO_LOGIN); } //添加最后一次登录数据 - xhpcAppUserMapper.addUserLoginTime(userid,username,userType,openId,Integer.valueOf(type),UserConstants.NO_LOGIN,tenantId); + xhpcAppUserMapper.addUserLoginTime(userid,username,userType,openId,Integer.valueOf(type),UserConstants.NO_LOGIN,tenantId,new Date()); } } // 删除用户缓存记录 @@ -440,10 +441,8 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { map.put("servicePhone",servicePhone); map.put("activity",1); map.put("activitySize",1); - map.put("activityImg","https://www.scxhua.cn/static/img/logo1.8460b7f4.png"); - map.put("socSize",98); - map.put("socUser",80); - map.put("socProtect",1); + map.put("activityImg","https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/bunengshanchu/1.png"); + map.put("socSize",redisService.getCacheObject("global:SOC")); return AjaxResult.success(map); }else{ @@ -460,7 +459,8 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { */ @Override @Transactional - public R logout(String phone, String code) { + public R logout(HttpServletRequest request,String phone, String code) { + if (StringUtils.isEmpty(code)) { return R.fail(HttpStatus.NOT_NULL, "验证码不能为空"); } @@ -471,11 +471,19 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { if (!code.equalsIgnoreCase(captcha)) { return R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); } - XhpcAppUser xhpcAppUser = xhpcAppUserMapper.getAppUserByPhone(phone); - if (StringUtils.isNull(xhpcAppUser)) { - return R.fail(HttpStatus.ERROR_STATUS, "用户不存在"); + LoginUser loginUser = tokenService.getLoginUser(request); + Long userid = loginUser.getUserid(); + Integer userType = loginUser.getUserType(); + String tenantId = loginUser.getTenantId(); + if(UserTypeUtil.USER_TYPE.equals(userType)){ + XhpcAppUser xhpcAppUser = xhpcAppUserMapper.getAppUserByPhone(phone); + if (StringUtils.isNull(xhpcAppUser)) { + return R.fail(HttpStatus.ERROR_STATUS, "用户不存在"); + } + xhpcAppUserMapper.deleteById(xhpcAppUser.getAppUserId()); + }else{ + return R.fail(HttpStatus.ERROR_STATUS, "用户不能注销"); } - xhpcAppUserMapper.deleteById(xhpcAppUser.getAppUserId()); redisService.deleteObject("pvToken:" + phone); return R.ok(); } @@ -507,11 +515,8 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { @Override public R batteryProtect(HttpServletRequest request, Integer soc,Integer socProtect,Integer userType) { LoginUser loginUser = logUserUtils.getLogUser(request); - Object version = redisService.getCacheObject("global:version"); - Object servicePhone = redisService.getCacheObject("global:phone"); //根据不同的用户类型查询不同的信息 Long userid = loginUser.getUserid(); - R user = userTypeService.getUser(null, loginUser.getUserid(), loginUser.getUserType(), null,loginUser.getTenantId()); if(user !=null && user.getData() !=null){ Map map = (Map)user.getData(); @@ -525,7 +530,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { }else if(UserTypeUtil.CUSTOMERS_TYPE.equals(userType)){ xhpcAppUserMapper.updateCustomersSocProtect(userid,socProtect,soc); } - return R.fail(HttpStatus.ERROR_STATUS, "设置失败"); + return R.fail(HttpStatus.SUCCESS, "设置成功"); } return R.fail(HttpStatus.ERROR_STATUS, "设置失败"); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCommunityServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCommunityServiceImpl.java index a1dcd9ab..463ac272 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCommunityServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCommunityServiceImpl.java @@ -1,8 +1,12 @@ package com.xhpc.user.service.impl; +import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; +import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; +import com.xhpc.system.api.model.LoginUser; import com.xhpc.user.domain.XhpcCommunity; import com.xhpc.user.domain.XhpcCommunityPersonnel; import com.xhpc.user.mapper.XhpcCommunityMapper; @@ -12,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -23,23 +28,25 @@ import java.util.Map; * @date 2021/12/20 9:59 */ @Service -public class XhpcCommunityServiceImpl implements IXhpcCommunityService { +public class XhpcCommunityServiceImpl extends BaseService implements IXhpcCommunityService { @Autowired private XhpcCommunityMapper xhpcCommunityMapper; @Autowired private IMechanismService mechanismService; + @Autowired + private TokenService tokenService; @Override - public List> list(String name) { + public List> list(HttpServletRequest request, String name) { Long userId = SecurityUtils.getUserId(); List> list =new ArrayList<>(); + LoginUser loginUser = tokenService.getLoginUser(request); if(userId !=null){ - Map landUser = xhpcCommunityMapper.getLandUser(userId); - if(landUser !=null && landUser.get("userType") !=null){ - if("00".equals(landUser.get("userType").toString())){ - list = xhpcCommunityMapper.list(name); - } + startPage(); + String userType = loginUser.getSysUser().getUserType(); + if(UserTypeUtil.SYS_USER_TYPE_ZERO.equals(userType)){ + list = xhpcCommunityMapper.list(name,loginUser.getTenantId()); } } return list; @@ -48,6 +55,10 @@ public class XhpcCommunityServiceImpl implements IXhpcCommunityService { @Override public AjaxResult addCommunity(XhpcCommunity xhpcCommunity) { + R r= judgeXhpcCommunity(xhpcCommunity); + if(r.getCode() !=200){ + return AjaxResult.error(r.getMsg()); + } //名称重复不能入库 Map communityById = xhpcCommunityMapper.getCommunityById(null, xhpcCommunity.getName(), null); if(communityById !=null){ @@ -84,6 +95,11 @@ public class XhpcCommunityServiceImpl implements IXhpcCommunityService { @Override public AjaxResult updateCommunity(XhpcCommunity xhpcCommunity) { + + R r = judgeXhpcCommunity(xhpcCommunity); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } //名称重复不能入库 Map communityById = xhpcCommunityMapper.getCommunityById(xhpcCommunity.getCommunityId(), xhpcCommunity.getName(), 2); if(communityById !=null){ @@ -118,6 +134,10 @@ public class XhpcCommunityServiceImpl implements IXhpcCommunityService { @Override @Transactional public AjaxResult addCommunityPersonnel(XhpcCommunityPersonnel xhpcCommunityPersonnel) { + R r = judgeXhpcCommunityPersonnel(xhpcCommunityPersonnel); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } String phone = xhpcCommunityPersonnel.getPhone(); String account = xhpcCommunityPersonnel.getAccount(); Map communityPersonnelById = xhpcCommunityMapper.getCommunityPersonnelById(null, phone, account, 3); @@ -149,6 +169,10 @@ public class XhpcCommunityServiceImpl implements IXhpcCommunityService { @Override public AjaxResult updateCommunityPersonnel(XhpcCommunityPersonnel xhpcCommunityPersonnel) { + R r = judgeXhpcCommunityPersonnel(xhpcCommunityPersonnel); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } Long communityPersonnelId = xhpcCommunityPersonnel.getCommunityPersonnelId(); String phone = xhpcCommunityPersonnel.getPhone(); String account = xhpcCommunityPersonnel.getAccount(); @@ -189,7 +213,7 @@ public class XhpcCommunityServiceImpl implements IXhpcCommunityService { BigDecimal rechargeMoney = xhpcCommunityPersonnel.getRechargeMoney(); Long communityPersonnelId = xhpcCommunityPersonnel.getCommunityPersonnelId(); - if(new BigDecimal(0).compareTo(rechargeMoney)==-1){ + if(rechargeMoney !=null &&new BigDecimal(0).compareTo(rechargeMoney)==-1){ //增加社区用户的剩余金额 Map communityPersonnelById = xhpcCommunityMapper.getCommunityPersonnelById(communityPersonnelId, null, null, 1); if(communityPersonnelById !=null){ @@ -217,4 +241,38 @@ public class XhpcCommunityServiceImpl implements IXhpcCommunityService { } return AjaxResult.error("充值金额必需大于0"); } + + public R judgeXhpcCommunity(XhpcCommunity xhpcCommunity){ + + if(xhpcCommunity.getName()==null || "".equals(xhpcCommunity.getName())){ + return R.fail("名称必填"); + } + if(xhpcCommunity.getContactName()==null || "".equals(xhpcCommunity.getContactName())){ + return R.fail("联系人必填"); + } + if(xhpcCommunity.getContactPhone()==null || "".equals(xhpcCommunity.getContactPhone())){ + return R.fail("联系人电话必填"); + } + if(xhpcCommunity.getAddress()==null || "".equals(xhpcCommunity.getAddress())){ + return R.fail("地址必填"); + } + return R.ok(); + } + + public R judgeXhpcCommunityPersonnel(XhpcCommunityPersonnel xhpcCommunityPersonnel){ + + if(xhpcCommunityPersonnel.getName()==null || "".equals(xhpcCommunityPersonnel.getName())){ + return R.fail("名称必填"); + } + if(xhpcCommunityPersonnel.getAccount()==null || "".equals(xhpcCommunityPersonnel.getAccount()) || !"ST".equals(xhpcCommunityPersonnel.getAccount().substring(0,2))){ + return R.fail("账号必填且ST开头10位"); + } + if(xhpcCommunityPersonnel.getPhone()==null || "".equals(xhpcCommunityPersonnel.getPhone()) || xhpcCommunityPersonnel.getPhone().length()!=11){ + return R.fail("绑定手机号必填"); + } + + return R.ok(); + } + + } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCustomersServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCustomersServiceImpl.java index 6e0a20c8..d5c71d37 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCustomersServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCustomersServiceImpl.java @@ -1,10 +1,13 @@ package com.xhpc.user.service.impl; +import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; import com.xhpc.system.api.model.LoginUser; +import com.xhpc.user.domain.XhpcCommunity; import com.xhpc.user.domain.XhpcCustomers; import com.xhpc.user.domain.XhpcCustomersPersonnel; import com.xhpc.user.mapper.XhpcCustomersMapper; @@ -26,7 +29,7 @@ import java.util.Map; * @date 2021/12/23 15:53 */ @Service -public class XhpcCustomersServiceImpl implements IXhpcCustomersService { +public class XhpcCustomersServiceImpl extends BaseService implements IXhpcCustomersService { @Autowired private XhpcCustomersMapper xhpcCustomersMapper; @@ -35,25 +38,25 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { @Autowired private TokenService tokenService; @Override - public List> list(String name) { - Long userId = SecurityUtils.getUserId(); + public List> list(HttpServletRequest request,String name) { List> list =new ArrayList<>(); - if(userId !=null){ - Map landUser = xhpcCustomersMapper.getLandUser(userId); - if(landUser !=null && landUser.get("userType") !=null){ - if("00".equals(landUser.get("userType").toString()) ){ - list = xhpcCustomersMapper.list(name,null); - }else{ - list = xhpcCustomersMapper.list(name,Long.parseLong(landUser.get("operatorId").toString())); - } - } + LoginUser loginUser = tokenService.getLoginUser(request); + startPage(); + String userType = loginUser.getSysUser().getUserType(); + if(UserTypeUtil.SYS_USER_TYPE_ZERO.equals(userType)){ + list = xhpcCustomersMapper.list(name,null,loginUser.getTenantId()); + }else{ + list = xhpcCustomersMapper.list(name,loginUser.getSysUser().getOperatorId(),loginUser.getTenantId()); } return list; } @Override public AjaxResult addCustomers(HttpServletRequest request, XhpcCustomers xhpcCustomers) { - + R r = judgeXhpcCustomers(xhpcCustomers); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } //名称重复不能入库 Map communityById = xhpcCustomersMapper.getCustomersById(null, xhpcCustomers.getName(), null); if(communityById !=null){ @@ -109,6 +112,10 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { @Override public AjaxResult updateCustomers(XhpcCustomers xhpcCustomers) { + R r = judgeXhpcCustomers(xhpcCustomers); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } //名称重复不能入库 Map customersById = xhpcCustomersMapper.getCustomersById(xhpcCustomers.getCustomersId(), xhpcCustomers.getName(), 2); if(customersById !=null){ @@ -135,6 +142,10 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { @Override public AjaxResult addCustomersPersonnel(XhpcCustomersPersonnel xhpcCustomersPersonnel) { + R r = judgeXhpcCustomersPersonnel(xhpcCustomersPersonnel); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } String phone = xhpcCustomersPersonnel.getPhone(); String account = xhpcCustomersPersonnel.getAccount(); Map communityPersonnelById = xhpcCustomersMapper.getCustomersPersonnelById(null, phone, account, 3); @@ -147,14 +158,18 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { } } BigDecimal rechargeMoney = xhpcCustomersPersonnel.getRechargeMoney(); - if(new BigDecimal(0).compareTo(rechargeMoney)==-1){ - //增加社区用户的剩余金额 - xhpcCustomersPersonnel.setSurplusMoney(rechargeMoney); + if(rechargeMoney !=null){ + if(new BigDecimal(0).compareTo(rechargeMoney)==-1){ + //增加社区用户的剩余金额 + xhpcCustomersPersonnel.setSurplusMoney(rechargeMoney); + } } xhpcCustomersMapper.addCustomersPersonnel(xhpcCustomersPersonnel); - //增加一条充值记录 - if(new BigDecimal(0).compareTo(rechargeMoney)==-1){ - mechanismService.addRechargeOrder(xhpcCustomersPersonnel.getCustomersPersonnelId(),UserTypeUtil.CUSTOMERS_TYPE,rechargeMoney,rechargeMoney,UserTypeUtil.RECHARGE_PT); + if(rechargeMoney !=null){ + //增加一条充值记录 + if(new BigDecimal(0).compareTo(rechargeMoney)==-1){ + mechanismService.addRechargeOrder(xhpcCustomersPersonnel.getCustomersPersonnelId(),UserTypeUtil.CUSTOMERS_TYPE,rechargeMoney,rechargeMoney,UserTypeUtil.RECHARGE_PT); + } } return AjaxResult.success(); } @@ -166,6 +181,10 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { @Override public AjaxResult updateCustomersPersonnel(XhpcCustomersPersonnel xhpcCustomersPersonnel) { + R r = judgeXhpcCustomersPersonnel(xhpcCustomersPersonnel); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } Long customersPersonnelId = xhpcCustomersPersonnel.getCustomersPersonnelId(); String phone = xhpcCustomersPersonnel.getPhone(); String account = xhpcCustomersPersonnel.getAccount(); @@ -199,7 +218,7 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { public AjaxResult addRecharge(XhpcCustomersPersonnel xhpcCustomersPersonnel) { BigDecimal rechargeMoney = xhpcCustomersPersonnel.getRechargeMoney(); Long customersPersonnelId = xhpcCustomersPersonnel.getCustomersPersonnelId(); - if(new BigDecimal(0).compareTo(rechargeMoney)==-1){ + if(rechargeMoney !=null && new BigDecimal(0).compareTo(rechargeMoney)==-1){ //增加社区用户的剩余金额 Map communityPersonnelById = xhpcCustomersMapper.getCustomersPersonnelById(customersPersonnelId, null, null, 1); if(communityPersonnelById !=null){ @@ -231,4 +250,36 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { public void updateCustomersPersonnelStatus(XhpcCustomersPersonnel xhpcCustomersPersonnel) { xhpcCustomersMapper.updateCustomersPersonnelStatus(xhpcCustomersPersonnel.getCustomersPersonnelId(),xhpcCustomersPersonnel.getStatus()); } + + public R judgeXhpcCustomers(XhpcCustomers xhpcCustomers){ + + if(xhpcCustomers.getName()==null || "".equals(xhpcCustomers.getName())){ + return R.fail("名称必填"); + } + if(xhpcCustomers.getContactName()==null || "".equals(xhpcCustomers.getContactName())){ + return R.fail("联系人必填"); + } + if(xhpcCustomers.getContactPhone()==null || "".equals(xhpcCustomers.getContactPhone())){ + return R.fail("联系人电话必填"); + } + if(xhpcCustomers.getAddress()==null || "".equals(xhpcCustomers.getAddress())){ + return R.fail("地址必填"); + } + return R.ok(); + } + + public R judgeXhpcCustomersPersonnel(XhpcCustomersPersonnel xhpcCustomersPersonnel){ + + if(xhpcCustomersPersonnel.getName()==null || "".equals(xhpcCustomersPersonnel.getName())){ + return R.fail("名称必填"); + } + if(xhpcCustomersPersonnel.getAccount()==null || "".equals(xhpcCustomersPersonnel.getAccount()) || "BE".equals(xhpcCustomersPersonnel.getAccount().substring(0,2))){ + return R.fail("账号必填且BE开头10位"); + } + if(xhpcCustomersPersonnel.getPhone()==null || "".equals(xhpcCustomersPersonnel.getPhone()) || xhpcCustomersPersonnel.getPhone().length() !=11){ + return R.fail("绑定手机号必填"); + } + return R.ok(); + } + } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java index ca0dd144..e365a4a8 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java @@ -4,6 +4,7 @@ import com.xhpc.common.core.constant.StatusConstants; import com.xhpc.common.core.constant.UserConstants; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.utils.StringUtils; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.system.api.domain.SysRole; import com.xhpc.system.api.domain.SysUser; import com.xhpc.user.domain.SysUserRole; @@ -23,7 +24,7 @@ import java.util.Map; * @author ruoyi */ @Service -public class XhpcUserServiceImpl implements IXhpcUserService { +public class XhpcUserServiceImpl extends BaseService implements IXhpcUserService { @Autowired private XhpcUserMapper xhpcUserMapper; @@ -74,6 +75,7 @@ public class XhpcUserServiceImpl implements IXhpcUserService { public List> selectOperatorUserList(String userName, String nickName, Long operatorId) { Long userId = SecurityUtils.getUserId(); SysUser sysUser = xhpcUserMapper.selectUserByUserId(userId); + startPage(); if (StatusConstants.SYSTEM_USER_TYPE.equals(sysUser.getUserType())) { return xhpcUserMapper.selectOperatorUserList(userName, nickName, operatorId,sysUser.getUserType()); } else { diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/MechanismMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/MechanismMapper.xml index fae76807..b1c3105a 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/MechanismMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/MechanismMapper.xml @@ -296,5 +296,5 @@ #{source}, -= + diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml index 77f5dadb..0285419a 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml @@ -167,9 +167,9 @@ update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, - soc = #{soc} - is_refund = #{isRefund} - soc_protect = #{socProtect} + soc = #{soc}, + is_refund = #{isRefund}, + soc_protect = #{socProtect}, WHERE app_user_id = #{appUserId} @@ -277,7 +277,10 @@ status, - tenant_id + tenant_id, + + + create_time, @@ -302,6 +305,9 @@ #{tenantId}, + + #{createTime}, + @@ -338,6 +344,7 @@ and tenant_id=#{tenantId} + order by create_time desc limit 1 diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml index c100293e..ccb3e0c2 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml @@ -12,7 +12,7 @@ phone as phone, is_refund_application as isRefundApplication, is_refund as isRefund, - soc as soc, + soc as socUser, balance as balance, avatar as avatar, status, @@ -24,6 +24,7 @@ concat(0) as userType, concat("C") as userTypeName, tenant_id tenantId, + soc_protect socProtect, create_time as createTime from xhpc_app_user where del_flag=0 @@ -45,7 +46,7 @@ phone as phone, is_refund_application as isRefundApplication, is_refund as isRefund, - soc as soc, + soc as socUser, surplus_money as balance, avatar as avatar, status, @@ -56,6 +57,7 @@ tenant_id tenantId, del_flag delFlag, concat(2) as userType, + soc_protect socProtect, concat("ST") as userTypeName, (select count(charging_station_id) from xhpc_mechanism where community_id=mechanism_id and source=0 and charging_station_id in (select charging_station_id from xhpc_terminal where 1=1 and del_flag=0 and serial_number=#{serialNumber})) as number, @@ -81,7 +83,7 @@ phone as phone, is_refund_application as isRefundApplication, is_refund as isRefund, - soc as soc, + soc as socUser, surplus_money as balance, avatar as avatar, status, @@ -92,6 +94,7 @@ del_flag delFlag, tenant_id tenantId, concat(3) as userType, + soc_protect socProtect, concat("BE") as userTypeName, (select count(charging_station_id) from xhpc_mechanism where customers_id=mechanism_id and source=1 and charging_station_id in (select charging_station_id from xhpc_terminal where 1=1 and del_flag=0 and serial_number=#{serialNumber})) as number, diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml index c5849223..ef6c311f 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml @@ -2,6 +2,7 @@ + @@ -37,6 +38,9 @@ and name like CONCAT('%',#{name},'%') + + and tenant_id=#{tenantId} + order by create_time desc @@ -147,8 +151,8 @@ contact_name = #{contactName}, contact_phone = #{contactPhone}, address = #{address}, - address = #{dimension}, - address = #{status}, + dimension = #{dimension}, + status = #{status}, del_flag = #{delFlag}, create_time = #{createTime}, create_by = #{createBy}, @@ -379,6 +383,7 @@ update_time = #{updateTime}, update_by = #{updateBy}, remark = #{remark}, + is_refund_application = #{isRefundApplication}, where community_personnel_id=#{communityPersonnelId} @@ -390,4 +395,5 @@ update xhpc_community_personnel set status=#{status} where community_personnel_id=#{communityPersonnelId} + diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml index 4d156835..a4e4ff34 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml @@ -39,6 +39,9 @@ and operator_id=#{operatorId} + + and tenant_id=#{tenantId} + order by create_time desc @@ -142,8 +145,8 @@ contact_name = #{contactName}, contact_phone = #{contactPhone}, address = #{address}, - address = #{dimension}, - address = #{status}, + dimension = #{dimension}, + status = #{status}, del_flag = #{delFlag}, create_time = #{createTime}, create_by = #{createBy},