parent
eb05e825aa
commit
b441549956
|
@ -6,9 +6,11 @@ import com.hzya.frame.finance.conf.message.service.IFeConfMessageTemplateService
|
|||
import com.hzya.frame.web.entity.JsonResultEntity;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import com.hzya.frame.web.entity.JsonResultEntity;
|
||||
import java.util.List;
|
||||
|
||||
import static com.hzya.frame.web.entity.BaseResult.getSuccessMessageEntity;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/fe/conf/message")
|
||||
|
||||
|
@ -33,7 +35,7 @@ public class MessageController {
|
|||
@RequestMapping(value = "/queryAll", method = RequestMethod.POST)
|
||||
public JsonResultEntity queryAll(@RequestBody FeConfMessageTemplateEntity feConfMessageTemplateEntity) {
|
||||
List<FeConfMessageTemplateEntity> feConfMessageTemplateEntities = iFeConfMessageTemplateService.queryAll(feConfMessageTemplateEntity);
|
||||
return new JsonResultEntity("查询成功",true,feConfMessageTemplateEntities);
|
||||
return getSuccessMessageEntity("查询成功",feConfMessageTemplateEntities);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -53,10 +55,11 @@ public class MessageController {
|
|||
if(feConfMessageTemplateEntity.getTitle() == null){
|
||||
throw new Exception("标题不能为空");
|
||||
}
|
||||
FeConfMessageTemplateEntity save = iFeConfMessageTemplateService.save(feConfMessageTemplateEntity);
|
||||
return new JsonResultEntity("新增成功",true,save);
|
||||
FeConfMessageTemplateEntity save = iFeConfMessageTemplateService.saveEntity(feConfMessageTemplateEntity);
|
||||
return getSuccessMessageEntity("新增成功",save);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 修改消息模板
|
||||
*/
|
||||
|
@ -66,7 +69,7 @@ public class MessageController {
|
|||
throw new Exception("参数不能为空");
|
||||
}
|
||||
FeConfMessageTemplateEntity update = iFeConfMessageTemplateService.update(feConfMessageTemplateEntity);
|
||||
return new JsonResultEntity("修改成功",true,update);
|
||||
return getSuccessMessageEntity("修改成功",update);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -75,7 +78,7 @@ public class MessageController {
|
|||
@RequestMapping(value = "/updateStatus", method = RequestMethod.POST)
|
||||
public JsonResultEntity updateStatus(@RequestBody FeConfMessageTemplateEntity feConfMessageTemplateEntity) throws Exception {
|
||||
FeConfMessageTemplateEntity update = iFeConfMessageTemplateService.updateStatus(feConfMessageTemplateEntity);
|
||||
return new JsonResultEntity("修改成功",true,update);
|
||||
return getSuccessMessageEntity("修改成功",update);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -84,7 +87,7 @@ public class MessageController {
|
|||
@RequestMapping(value = "/delete", method = RequestMethod.POST)
|
||||
public JsonResultEntity delete(@RequestBody FeConfMessageTemplateEntity feConfMessageTemplateEntity) throws Exception {
|
||||
iFeConfMessageTemplateService.logicRemove(feConfMessageTemplateEntity);
|
||||
return new JsonResultEntity("删除成功",true,null);
|
||||
return getSuccessMessageEntity("删除成功",null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -93,7 +96,7 @@ public class MessageController {
|
|||
@PostMapping("/queryTemplate")
|
||||
public JsonResultEntity queryTemplate(@RequestBody FeConfMessageTemplateEntity feConfMessageTemplateEntity) throws Exception {
|
||||
PageInfo pageInfo = iFeConfMessageTemplateService.queryTemplate(feConfMessageTemplateEntity);
|
||||
return new JsonResultEntity("查询成功",true,pageInfo);
|
||||
return getSuccessMessageEntity("查询成功",pageInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -102,7 +105,7 @@ public class MessageController {
|
|||
@PostMapping("/queryTemplateDetail")
|
||||
public JsonResultEntity queryTemplateDetail(@RequestBody FeConfMessageTemplateEntity feConfMessageTemplateEntity) throws Exception {
|
||||
FeConfMessageTemplateEntity templateEntity = iFeConfMessageTemplateService.queryTemplateDetail(feConfMessageTemplateEntity);
|
||||
return new JsonResultEntity("查询成功",true,templateEntity);
|
||||
return getSuccessMessageEntity("查询成功",templateEntity);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -26,4 +26,6 @@ public interface IFeConfMessageTemplateService extends IBaseService<FeConfMessag
|
|||
PageInfo queryTemplate(FeConfMessageTemplateEntity feConfMessageTemplateEntity);
|
||||
|
||||
FeConfMessageTemplateEntity queryTemplateDetail(FeConfMessageTemplateEntity feConfMessageTemplateEntity);
|
||||
|
||||
FeConfMessageTemplateEntity saveEntity(FeConfMessageTemplateEntity feConfMessageTemplateEntity);
|
||||
}
|
||||
|
|
|
@ -100,4 +100,13 @@ public class FeConfMessageTemplateServiceImpl extends BaseService<FeConfMessageT
|
|||
public FeConfMessageTemplateEntity queryTemplateDetail(FeConfMessageTemplateEntity feConfMessageTemplateEntity) {
|
||||
return feConfMessageTemplateDao.queryOne(feConfMessageTemplateEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FeConfMessageTemplateEntity saveEntity(FeConfMessageTemplateEntity feConfMessageTemplateEntity) {
|
||||
if (feConfMessageTemplateEntity.getEnablestate() == null || feConfMessageTemplateEntity.getEnablestate().equals("")) {
|
||||
feConfMessageTemplateEntity.setEnablestate("Y");
|
||||
}
|
||||
FeConfMessageTemplateEntity save = feConfMessageTemplateDao.save(feConfMessageTemplateEntity);
|
||||
return save;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import static com.hzya.frame.web.entity.BaseResult.getSuccessMessageEntity;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/fe/conf/notificationRules")
|
||||
public class NotificationRulesController {
|
||||
|
@ -28,7 +30,7 @@ public class NotificationRulesController {
|
|||
@PostMapping("/queryPaged")
|
||||
public JsonResultEntity queryPaged(@RequestBody FeConfNotificationRulesEntity feConfNotificationRulesEntity){
|
||||
PageInfo pageInfo = iFeConfNotificationRulesService.queryNotificationRulesPaged(feConfNotificationRulesEntity);
|
||||
return new JsonResultEntity("查询成功",true,pageInfo);
|
||||
return getSuccessMessageEntity("查询成功",pageInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -37,7 +39,7 @@ public class NotificationRulesController {
|
|||
@PostMapping("/queryAll")
|
||||
public JsonResultEntity queryAll(@RequestBody FeConfNotificationRulesEntity feConfNotificationRulesEntity){
|
||||
List<FeConfNotificationRulesEntity> list = iFeConfNotificationRulesService.queryByLike(feConfNotificationRulesEntity);
|
||||
return new JsonResultEntity("查询成功",true,list);
|
||||
return getSuccessMessageEntity("查询成功",list);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -46,7 +48,7 @@ public class NotificationRulesController {
|
|||
@PostMapping("/add")
|
||||
public JsonResultEntity add(@RequestBody FeConfNotificationRulesEntity feConfNotificationRulesEntity){
|
||||
FeConfNotificationRulesEntity feConfNotificationRulesEntity1 = iFeConfNotificationRulesService.insert(feConfNotificationRulesEntity);
|
||||
return new JsonResultEntity("新增成功",true,feConfNotificationRulesEntity1);
|
||||
return getSuccessMessageEntity("新增成功",feConfNotificationRulesEntity1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -55,7 +57,7 @@ public class NotificationRulesController {
|
|||
@PostMapping("/updateStatus")
|
||||
public JsonResultEntity updateStatus(@RequestBody FeConfNotificationRulesEntity feConfNotificationRulesEntity){
|
||||
FeConfNotificationRulesEntity feConfNotificationRulesEntity1 = iFeConfNotificationRulesService.updateStatus(feConfNotificationRulesEntity);
|
||||
return new JsonResultEntity("更新成功",true,feConfNotificationRulesEntity1);
|
||||
return getSuccessMessageEntity("更新成功",feConfNotificationRulesEntity1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -64,7 +66,7 @@ public class NotificationRulesController {
|
|||
@PostMapping("/update")
|
||||
public JsonResultEntity update(@RequestBody FeConfNotificationRulesEntity feConfNotificationRulesEntity) throws Exception {
|
||||
FeConfNotificationRulesEntity feConfNotificationRulesEntity1 = iFeConfNotificationRulesService.updateFeConfNotificationRulesEntity(feConfNotificationRulesEntity);
|
||||
return new JsonResultEntity("修改成功",true,feConfNotificationRulesEntity1);
|
||||
return getSuccessMessageEntity("修改成功",feConfNotificationRulesEntity1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -72,11 +74,8 @@ public class NotificationRulesController {
|
|||
*/
|
||||
@PostMapping("/delete")
|
||||
public JsonResultEntity delete(@RequestBody FeConfNotificationRulesEntity feConfNotificationRulesEntity) throws Exception {
|
||||
if(feConfNotificationRulesEntity.getSts().equals("N")){
|
||||
throw new Exception("该记录已删除");
|
||||
}
|
||||
iFeConfNotificationRulesService.logicRemove(feConfNotificationRulesEntity);
|
||||
return new JsonResultEntity("删除成功",true,null);
|
||||
return getSuccessMessageEntity("删除成功",null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -85,7 +84,7 @@ public class NotificationRulesController {
|
|||
@PostMapping("/query")
|
||||
public JsonResultEntity query(@RequestBody FeConfNotificationRulesEntity feConfNotificationRulesEntity) {
|
||||
PageInfo pageInfo = iFeConfNotificationRulesService.queryFeConfNotificationRulesEntity(feConfNotificationRulesEntity);
|
||||
return new JsonResultEntity("查询成功",true,pageInfo);
|
||||
return getSuccessMessageEntity("查询成功",pageInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -94,14 +93,24 @@ public class NotificationRulesController {
|
|||
@PostMapping("/queryBillType")
|
||||
public JsonResultEntity queryBillType() {
|
||||
List<BillTypeVO> billTypeVOS = iFeConfNotificationRulesService.queryFeConfBillTypeEntity();
|
||||
return new JsonResultEntity("查询成功",true,billTypeVOS);
|
||||
return getSuccessMessageEntity("查询成功",billTypeVOS);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据id查询详情
|
||||
*/
|
||||
@PostMapping("/queryById")
|
||||
public JsonResultEntity queryById(@RequestBody FeConfNotificationRulesEntity feConfNotificationRulesEntity) {
|
||||
FeConfNotificationRulesEntity feConfNotificationRulesEntity1 = iFeConfNotificationRulesService.queryFeConfNotificationRulesEntityById(feConfNotificationRulesEntity);
|
||||
return new JsonResultEntity("查询成功",true,feConfNotificationRulesEntity1);
|
||||
return getSuccessMessageEntity("查询成功",feConfNotificationRulesEntity1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据业务类型id查询消息模板
|
||||
*/
|
||||
@PostMapping("/queryTemplateByMdmId")
|
||||
public JsonResultEntity queryTemplateByBusinessId(@RequestBody FeConfNotificationRulesEntity feConfNotificationRulesEntity) {
|
||||
List<FeConfMessageTemplateEntity> feConfMessageTemplateEntities = iFeConfNotificationRulesService.queryFeConfNotificationRulesEntityByMdmId(feConfNotificationRulesEntity);
|
||||
return getSuccessMessageEntity("查询成功",feConfMessageTemplateEntities);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package com.hzya.frame.finance.conf.notificationRules.dao;
|
||||
|
||||
import com.hzya.frame.finance.conf.message.entity.FeConfMessageTemplateEntity;
|
||||
import com.hzya.frame.finance.conf.notificationRules.entity.BillTypeVO;
|
||||
import com.hzya.frame.finance.conf.notificationRules.entity.FeConfNotificationRulesEntity;
|
||||
import com.hzya.frame.basedao.dao.IBaseDao;
|
||||
|
@ -23,5 +24,11 @@ public interface IFeConfNotificationRulesDao extends IBaseDao<FeConfNotification
|
|||
List<FeConfNotificationRulesEntity> queryFeConfNotificationRulesEntity(String mdmId, String mdmName);
|
||||
|
||||
List<BillTypeVO> queryFeConfBillTypeEntity();
|
||||
|
||||
BillTypeVO queryBillTypeEntity(String pkBilltypeid);
|
||||
|
||||
FeConfMessageTemplateEntity queryMessageTemplate(Long messageTemplateid);
|
||||
|
||||
List<FeConfMessageTemplateEntity> queryMessageTemplateEntityByMdmId(String mdmId);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package com.hzya.frame.finance.conf.notificationRules.dao.impl;
|
||||
|
||||
import com.hzya.frame.finance.conf.message.entity.FeConfMessageTemplateEntity;
|
||||
import com.hzya.frame.finance.conf.notificationRules.entity.BillTypeVO;
|
||||
import com.hzya.frame.finance.conf.notificationRules.entity.FeConfNotificationRulesEntity;
|
||||
import com.hzya.frame.finance.conf.notificationRules.dao.IFeConfNotificationRulesDao;
|
||||
|
@ -50,6 +51,24 @@ public class FeConfNotificationRulesDaoImpl extends MybatisGenericDao<FeConfNoti
|
|||
return billTypeVOs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BillTypeVO queryBillTypeEntity(String pkBilltypeid) {
|
||||
BillTypeVO billTypeVO = (BillTypeVO) this.selectOne("com.hzya.frame.finance.conf.notificationRules.dao.impl.FeConfNotificationRulesDaoImpl.queryBillTypeEntity", pkBilltypeid);
|
||||
return billTypeVO;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FeConfMessageTemplateEntity queryMessageTemplate(Long messageTemplateid) {
|
||||
FeConfMessageTemplateEntity feConfMessageTemplateEntity = (FeConfMessageTemplateEntity) this.selectOne("com.hzya.frame.finance.conf.notificationRules.dao.impl.FeConfNotificationRulesDaoImpl.queryMessageTemplate", messageTemplateid);
|
||||
return feConfMessageTemplateEntity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FeConfMessageTemplateEntity> queryMessageTemplateEntityByMdmId(String mdmId) {
|
||||
List<FeConfMessageTemplateEntity> feConfMessageTemplateEntitys = (List<FeConfMessageTemplateEntity>) this.selectList("com.hzya.frame.finance.conf.notificationRules.dao.impl.FeConfNotificationRulesDaoImpl.queryMessageTemplateEntityByMdmId", mdmId);
|
||||
return feConfMessageTemplateEntitys;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -266,19 +266,44 @@
|
|||
</trim>
|
||||
|
||||
</select>
|
||||
|
||||
<select id="queryFeConfNotificationRulesEntity" resultMap="get-FeConfNotificationRulesEntity-result" parameterType = "com.hzya.frame.finance.conf.notificationRules.entity.FeConfNotificationRulesEntity">
|
||||
select *
|
||||
from fe_conf_notification_rules
|
||||
where mdm_id = #{mdmId} and mdm_name = #{mdmName}
|
||||
</select>
|
||||
|
||||
|
||||
<select id="queryBillType" resultType="com.hzya.frame.finance.conf.notificationRules.entity.BillTypeVO">
|
||||
<select id="queryBillTypeEntity" resultType="com.hzya.frame.finance.conf.notificationRules.entity.BillTypeVO">
|
||||
select
|
||||
pk_billtypeid as pkBilltypeid,
|
||||
pk_billtypecode as pkBilltypecode,
|
||||
billtypename as pkBilltypename
|
||||
from mdm_bd_bd_billtype
|
||||
where pk_billtypeid = #{pkBilltypeid}
|
||||
</select>
|
||||
|
||||
<select id="queryBillType" resultType="com.hzya.frame.finance.conf.notificationRules.entity.BillTypeVO">
|
||||
SELECT
|
||||
pk_billtypeid AS pkBilltypeid,
|
||||
pk_billtypecode AS pkBilltypecode,
|
||||
billtypename AS pkBilltypename
|
||||
FROM
|
||||
mdm_bd_bd_billtype
|
||||
WHERE
|
||||
parentbilltype IN ( 'F2', 'F4', 'F3', 'F5' )
|
||||
AND pk_group = '0001D910000000000YQR'
|
||||
</select>
|
||||
|
||||
<select id="queryMessageTemplate" resultType="com.hzya.frame.finance.conf.message.entity.FeConfMessageTemplateEntity">
|
||||
select id,code,`name`
|
||||
from fe_conf_message_template
|
||||
where id = #{messageTemplateid}
|
||||
</select>
|
||||
<select id="queryMessageTemplateEntityByMdmId" resultType="com.hzya.frame.finance.conf.message.entity.FeConfMessageTemplateEntity">
|
||||
select
|
||||
id,code,name,title,enablestate,remark,def1,def2,def3,def4,def5,def6,def7,def8,def9,def10,create_time,create_user,modify_time,modify_user,sts,mdm_id,mdm_name
|
||||
from fe_conf_message_template
|
||||
where mdm_id = #{mdmId} and sts = 'Y' and enablestate = 'Y'
|
||||
</select>
|
||||
<!-- 查询列表 字段采用or格式 -->
|
||||
<select id="FeConfNotificationRulesentity_list_or" resultMap="get-FeConfNotificationRulesEntity-result" parameterType = "com.hzya.frame.finance.conf.notificationRules.entity.FeConfNotificationRulesEntity">
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package com.hzya.frame.finance.conf.notificationRules.service;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.hzya.frame.finance.conf.message.entity.FeConfMessageTemplateEntity;
|
||||
import com.hzya.frame.finance.conf.notificationRules.entity.BillTypeVO;
|
||||
import com.hzya.frame.finance.conf.notificationRules.entity.FeConfNotificationRulesEntity;
|
||||
import com.hzya.frame.basedao.service.IBaseService;
|
||||
|
@ -27,4 +28,6 @@ public interface IFeConfNotificationRulesService extends IBaseService<FeConfNoti
|
|||
List<BillTypeVO> queryFeConfBillTypeEntity();
|
||||
|
||||
FeConfNotificationRulesEntity queryFeConfNotificationRulesEntityById(FeConfNotificationRulesEntity feConfNotificationRulesEntity);
|
||||
|
||||
List<FeConfMessageTemplateEntity> queryFeConfNotificationRulesEntityByMdmId(FeConfNotificationRulesEntity feConfNotificationRulesEntity);
|
||||
}
|
||||
|
|
|
@ -2,6 +2,7 @@ package com.hzya.frame.finance.conf.notificationRules.service.impl;
|
|||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.hzya.frame.finance.conf.message.entity.FeConfMessageTemplateEntity;
|
||||
import com.hzya.frame.finance.conf.notificationRules.entity.BillTypeVO;
|
||||
import com.hzya.frame.finance.conf.notificationRules.entity.FeConfNotificationRulesEntity;
|
||||
import com.hzya.frame.finance.conf.notificationRules.dao.IFeConfNotificationRulesDao;
|
||||
|
@ -60,6 +61,17 @@ public class FeConfNotificationRulesServiceImpl extends BaseService<FeConfNotifi
|
|||
if(feConfNotificationRulesEntity.getMessageTemplateid() == null || "".equals(feConfNotificationRulesEntity.getMessageTemplateid())){
|
||||
throw new RuntimeException("消息模板不能为空");
|
||||
}
|
||||
// 查询单据类型
|
||||
BillTypeVO billTypeVO = feConfNotificationRulesDao.queryBillTypeEntity(feConfNotificationRulesEntity.getPkBilltypeid());
|
||||
feConfNotificationRulesEntity.setPkBilltypecode(billTypeVO.getPkBilltypecode());
|
||||
feConfNotificationRulesEntity.setPkBilltypename(billTypeVO.getPkBilltypename());
|
||||
// 查询消息模板
|
||||
FeConfMessageTemplateEntity feConfMessageTemplateEntity = feConfNotificationRulesDao.queryMessageTemplate(feConfNotificationRulesEntity.getMessageTemplateid());
|
||||
feConfNotificationRulesEntity.setMessageTemplatecode(feConfMessageTemplateEntity.getCode());
|
||||
feConfNotificationRulesEntity.setMessageTemplatename(feConfMessageTemplateEntity.getName());
|
||||
if(feConfNotificationRulesEntity.getEnablestate() == null || "".equals(feConfNotificationRulesEntity.getEnablestate())){
|
||||
feConfNotificationRulesEntity.setEnablestate("Y");
|
||||
}
|
||||
FeConfNotificationRulesEntity save = feConfNotificationRulesDao.save(feConfNotificationRulesEntity);
|
||||
FeConfNotificationRulesEntity feConfNotificationRulesEntity1 = feConfNotificationRulesDao.queryById(save.getId());
|
||||
return feConfNotificationRulesEntity1;
|
||||
|
@ -106,14 +118,35 @@ public class FeConfNotificationRulesServiceImpl extends BaseService<FeConfNotifi
|
|||
return new PageInfo(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询单据类型
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<BillTypeVO> queryFeConfBillTypeEntity() {
|
||||
return feConfNotificationRulesDao.queryFeConfBillTypeEntity();
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据id查询通知规则详情
|
||||
* @param feConfNotificationRulesEntity
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public FeConfNotificationRulesEntity queryFeConfNotificationRulesEntityById(FeConfNotificationRulesEntity feConfNotificationRulesEntity) {
|
||||
FeConfNotificationRulesEntity feConfNotificationRulesEntity1 = feConfNotificationRulesDao.queryOne(feConfNotificationRulesEntity);
|
||||
return feConfNotificationRulesEntity1;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据业务类型id查询消息模板
|
||||
* @param feConfNotificationRulesEntity
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<FeConfMessageTemplateEntity> queryFeConfNotificationRulesEntityByMdmId(FeConfNotificationRulesEntity feConfNotificationRulesEntity) {
|
||||
String mdmId = feConfNotificationRulesEntity.getMdmId();
|
||||
List<FeConfMessageTemplateEntity> feConfMessageTemplateEntities = feConfNotificationRulesDao.queryMessageTemplateEntityByMdmId(mdmId);
|
||||
return feConfMessageTemplateEntities;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
package com.hzya.frame.finance.login.controller;
|
||||
|
||||
import com.hzya.frame.finance.login.entity.LoginVO;
|
||||
import com.hzya.frame.sysnew.login.ILoginService;
|
||||
import com.hzya.frame.web.entity.JsonResultEntity;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import static com.hzya.frame.web.entity.BaseResult.getSuccessMessageEntity;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/sso/login")
|
||||
public class SSOController {
|
||||
|
||||
@Autowired
|
||||
private ILoginService iLoginService;
|
||||
|
||||
/**
|
||||
* 单点登录验证
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/check")
|
||||
public JsonResultEntity checkLogin(@RequestBody LoginVO loginVO){
|
||||
String token = iLoginService.checkLogin(loginVO.getWxUserId());
|
||||
return getSuccessMessageEntity("校验成功",token);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,12 @@
|
|||
package com.hzya.frame.finance.login.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class LoginVO {
|
||||
private String wxUserId;
|
||||
}
|
|
@ -24,4 +24,11 @@ public interface ILoginService {
|
|||
* @return com.hzya.frame.web.entity.JsonResultEntity
|
||||
**/
|
||||
JsonResultEntity appDoLogin(JSONObject jsonObject) ;
|
||||
|
||||
/**
|
||||
* 单点登录验证
|
||||
* @param wxUserId
|
||||
* @return
|
||||
*/
|
||||
String checkLogin(String wxUserId);
|
||||
}
|
||||
|
|
|
@ -145,6 +145,7 @@ public class LoginServiceImpl implements ILoginService {
|
|||
//获取token
|
||||
SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
|
||||
String token = tokenInfo.getTokenValue();
|
||||
|
||||
//获取公司
|
||||
SysOrganEntity sysOrganEntity = new SysOrganEntity();
|
||||
sysOrganEntity.setUserId(sysUserEntity.getId());
|
||||
|
@ -301,6 +302,8 @@ public class LoginServiceImpl implements ILoginService {
|
|||
|
||||
}
|
||||
|
||||
|
||||
|
||||
private JSONObject getAccess_token(String appId,String apiCode) {
|
||||
String result = HttpRequest.post(url).
|
||||
header("appId",appId).
|
||||
|
@ -335,4 +338,30 @@ public class LoginServiceImpl implements ILoginService {
|
|||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 单点登录验证
|
||||
* @param wxUserId
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public String checkLogin(String wxUserId) {
|
||||
if(wxUserId == null){
|
||||
throw new RuntimeException("wxUserId不能为空");
|
||||
}
|
||||
SysUserEntity sysUserEntity = new SysUserEntity();
|
||||
sysUserEntity.setWxUserId(wxUserId);
|
||||
SysUserEntity query = sysUserDao.queryOne(sysUserEntity);
|
||||
if(query == null){
|
||||
// 验证不通过
|
||||
throw new RuntimeException("用户不存在");
|
||||
}
|
||||
// 验证通过
|
||||
StpUtil.login(query.getId());
|
||||
SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
|
||||
String token = tokenInfo.toString();
|
||||
|
||||
return token;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,5 +14,7 @@ import java.util.List;
|
|||
public interface ISysUserDao extends IBaseDao<SysUserEntity, String> {
|
||||
|
||||
List<SysUserEntity> queryByLikePerson(SysUserEntity entity);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -22,5 +22,8 @@ public class SysUserDaoImpl extends MybatisGenericDao<SysUserEntity, String> imp
|
|||
List<SysUserEntity> o = super.query(getSqlIdPrifx() + "queryByLikePerson", entity);
|
||||
return o;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -237,6 +237,7 @@
|
|||
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
|
||||
</select>
|
||||
|
||||
|
||||
<!-- 查询列表 字段采用or格式 -->
|
||||
<select id="SysUserentity_list_or" resultMap="get-SysUserEntity-result"
|
||||
parameterType="com.hzya.frame.sysnew.user.entity.SysUserEntity">
|
||||
|
|
Loading…
Reference in New Issue