diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml index 938c5d12..06844f5a 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml @@ -21,6 +21,8 @@ + + diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java index 6f247026..4cb493e5 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java @@ -45,6 +45,16 @@ public class XhpcTerminal extends BaseEntity { /** 费率模型id */ private Long rateModelId; + private Long operatorId; + + public Long getOperatorId() { + return operatorId; + } + + public void setOperatorId(Long operatorId) { + this.operatorId = operatorId; + } + public static long getSerialVersionUID() { return serialVersionUID; 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 new file mode 100644 index 00000000..16360e06 --- /dev/null +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcEtTokenController.java @@ -0,0 +1,45 @@ +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.general.domain.EtTokenEntity; +import com.xhpc.general.service.IXhpcEtTokenService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * program: ruoyi + * User: HongYun + * Date:2021-09-10 14 + */ +@RestController +@RequestMapping(value = "/token") +public class XhpcEtTokenController extends BaseController { + + + @Autowired + private IXhpcEtTokenService iXhpcEtTokenService; + + @GetMapping(value = "/list") + public TableDataInfo list(String operatorId, String operatorId3irdpty){ + + startPage(); + return getDataTable(iXhpcEtTokenService.list(operatorId, operatorId3irdpty)); + } + + @PostMapping(value = "/delete") + public AjaxResult delete(@RequestBody EtTokenEntity etTokenEntity){ + + return iXhpcEtTokenService.delete(etTokenEntity.getId()); + } + + @PostMapping(value = "/add") + public AjaxResult add(@RequestBody EtTokenEntity etTokenEntity){ + + return iXhpcEtTokenService.add(etTokenEntity.getOperatorId(),etTokenEntity.getOperatorId3irdpty(), + etTokenEntity.getSecretTokenType(),etTokenEntity.getDataSecret(), + etTokenEntity.getDataSecretiv(),etTokenEntity.getOperatorSecret(),etTokenEntity.getSigSecret(), + etTokenEntity.getEncrypt(),etTokenEntity.getUrlPrefix()); + } +} 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 dac4f5bd..9a3daf03 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 @@ -5,8 +5,6 @@ import com.xhpc.general.service.IXhpcServiceDataUpdateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import static com.xhpc.general.service.XhpcSmsServiceImpl.REDIS; - /** * program: ruoyi * User: HongYun diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/domain/EtTokenEntity.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/domain/EtTokenEntity.java new file mode 100644 index 00000000..83ff8782 --- /dev/null +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/domain/EtTokenEntity.java @@ -0,0 +1,119 @@ +package com.xhpc.general.domain; + +import java.util.Date; + +/** + * program: ruoyi + * User: HongYun + * Date:2021-09-10 14 + */ +public class EtTokenEntity { + private Integer id; + private String operatorId; + private String operatorId3irdpty; + private String secretTokenType; + private String token; + private Date tokenExpiry; + private String dataSecret; + private String dataSecretiv; + private String operatorSecret; + private String sigSecret; + private Boolean encrypt; + private String urlPrefix; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getOperatorId() { + return operatorId; + } + + public void setOperatorId(String operatorId) { + this.operatorId = operatorId; + } + + public String getOperatorId3irdpty() { + return operatorId3irdpty; + } + + public void setOperatorId3irdpty(String operatorId3irdpty) { + this.operatorId3irdpty = operatorId3irdpty; + } + + public String getSecretTokenType() { + return secretTokenType; + } + + public void setSecretTokenType(String secretTokenType) { + this.secretTokenType = secretTokenType; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + public Date getTokenExpiry() { + return tokenExpiry; + } + + public void setTokenExpiry(Date tokenExpiry) { + this.tokenExpiry = tokenExpiry; + } + + public String getDataSecret() { + return dataSecret; + } + + public void setDataSecret(String dataSecret) { + this.dataSecret = dataSecret; + } + + public String getDataSecretiv() { + return dataSecretiv; + } + + public void setDataSecretiv(String dataSecretiv) { + this.dataSecretiv = dataSecretiv; + } + + public String getOperatorSecret() { + return operatorSecret; + } + + public void setOperatorSecret(String operatorSecret) { + this.operatorSecret = operatorSecret; + } + + public String getSigSecret() { + return sigSecret; + } + + public void setSigSecret(String sigSecret) { + this.sigSecret = sigSecret; + } + + public Boolean getEncrypt() { + return encrypt; + } + + public void setEncrypt(Boolean encrypt) { + this.encrypt = encrypt; + } + + public String getUrlPrefix() { + return urlPrefix; + } + + public void setUrlPrefix(String urlPrefix) { + this.urlPrefix = urlPrefix; + } +} diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcEtTokenMapper.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcEtTokenMapper.java new file mode 100644 index 00000000..c8603dfa --- /dev/null +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcEtTokenMapper.java @@ -0,0 +1,26 @@ +package com.xhpc.general.mapper; + +import com.xhpc.general.domain.EtTokenEntity; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; + +/** + * program: ruoyi + * User: HongYun + * Date:2021-09-10 14 + */ +public interface XhpcEtTokenMapper { + + + List selectBy(@Param(value = "operatorId") String operatorId,@Param(value = "operatorId3irdpty") String operatorId3irdpty); + + int deleteBy(@Param(value = "id") Integer id); + + int checkExistsBy(@Param(value = "operatorId") String operatorId,@Param(value = "operatorId3irdpty") String operatorId3irdpty,@Param(value = "secretTokenType") String secretTokenType); + + int insertBy(@Param(value = "operatorId") String operatorId,@Param(value = "operatorId3irdpty") String operatorId3irdpty,@Param(value = "secretTokenType") String secretTokenType, + @Param(value = "dataSecret") String dataSecret,@Param(value = "dataSecretiv") String dataSecretiv,@Param(value ="operatorSecret" ) String operatorSecret, + @Param(value = "sigSecret") String sigSecret,@Param(value = "encrypt") Boolean encrypt,@Param(value = "urlPrefix") String urlPrefix); +} diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcEtTokenService.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcEtTokenService.java new file mode 100644 index 00000000..d6e98d6f --- /dev/null +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcEtTokenService.java @@ -0,0 +1,23 @@ +package com.xhpc.general.service; + +import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.general.domain.EtTokenEntity; + +import java.util.Date; +import java.util.List; + +/** + * program: ruoyi + * User: HongYun + * Date:2021-09-10 14 + */ +public interface IXhpcEtTokenService { + + List list(String operatorId,String operatorId3irdpty); + + AjaxResult delete(Integer id); + + AjaxResult add(String operatorId, String operatorId3irdpty, String secretTokenType, + String dataSecret,String dataSecretiv,String operatorSecret, + String sigSecret,Boolean encrypt,String urlPrefix); +} diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcTeTokenServiceImpl.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcTeTokenServiceImpl.java new file mode 100644 index 00000000..7d3e4696 --- /dev/null +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcTeTokenServiceImpl.java @@ -0,0 +1,47 @@ +package com.xhpc.general.service; + +import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.general.domain.EtTokenEntity; +import com.xhpc.general.mapper.XhpcEtTokenMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * program: ruoyi + * User: HongYun + * Date:2021-09-10 14 + */ +@Service +public class XhpcTeTokenServiceImpl implements IXhpcEtTokenService { + + @Autowired + private XhpcEtTokenMapper xhpcEtTokenMapper; + + @Override + public List list(String operatorId, String operatorId3irdpty) { + + return xhpcEtTokenMapper.selectBy(operatorId, operatorId3irdpty); + } + + @Override + public AjaxResult delete(Integer id) { + + int result = xhpcEtTokenMapper.deleteBy(id); + return result==1? AjaxResult.success() :AjaxResult.error(); + } + + @Override + public AjaxResult add(String operatorId, String operatorId3irdpty, String secretTokenType,String dataSecret, String dataSecretiv, String operatorSecret, String sigSecret, Boolean encrypt, String urlPrefix) { + + int checkExistsSign = xhpcEtTokenMapper.checkExistsBy(operatorId, operatorId3irdpty, secretTokenType); + if(checkExistsSign!=0){ + return AjaxResult.error("该密钥设置已存在"); + }else { + int result = xhpcEtTokenMapper.insertBy(operatorId, operatorId3irdpty, secretTokenType, dataSecret, dataSecretiv, operatorSecret, sigSecret, encrypt, urlPrefix); + return result==1? AjaxResult.success():AjaxResult.error(); + } + } +} diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcEtTokenMapper.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcEtTokenMapper.xml new file mode 100644 index 00000000..94ab0063 --- /dev/null +++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcEtTokenMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + delete from et_auth_sec_token + where id = #{id} + + + + + + + insert into et_auth_sec_token + (operator_id,operator_id3irdpty,secret_token_type,data_secret,data_secretiv,operator_secret,sig_secret,encrypt,url_prefix) + values (#{operatorId},#{operatorId3irdpty},#{secretTokenType}, + #{dataSecret},#{dataSecretiv},#{operatorSecret},#{sigSecret},#{encrypt},#{urlPrefix}) + + \ No newline at end of file