diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/service/DictService.java b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExDictService.java similarity index 93% rename from ccic-exam/src/main/java/com/ccic/safeliab/service/DictService.java rename to ccic-exam/src/main/java/com/ccic/safeliab/service/ExDictService.java index c767792..2f021b6 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/service/DictService.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExDictService.java @@ -25,7 +25,7 @@ import java.util.List; * * @author edwong */ -public interface DictService extends BaseService { +public interface ExDictService extends BaseService { /** * 获取字典表 diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/service/DictServiceImpl.java b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExDictServiceImpl.java similarity index 83% rename from ccic-exam/src/main/java/com/ccic/safeliab/service/DictServiceImpl.java rename to ccic-exam/src/main/java/com/ccic/safeliab/service/ExDictServiceImpl.java index e355619..46d70b3 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/service/DictServiceImpl.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExDictServiceImpl.java @@ -15,8 +15,6 @@ */ package com.ccic.safeliab.service; -import cn.hutool.crypto.SecureUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ccic.safeliab.dao.DictMapper; import com.ccic.safeliab.entity.ExDict; import com.ccic.safeliab.support.BaseServiceImpl; @@ -30,7 +28,7 @@ import java.util.List; * @author edwong */ @Service -public class DictServiceImpl extends BaseServiceImpl implements DictService { +public class ExDictServiceImpl extends BaseServiceImpl implements ExDictService { @Override diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/web/DemoController.java b/ccic-exam/src/main/java/com/ccic/safeliab/web/DemoController.java index 18e2eb9..5fe880d 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/web/DemoController.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/web/DemoController.java @@ -1,13 +1,24 @@ package com.ccic.safeliab.web; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.bes.enterprise.webtier.servlet4preview.http.HttpServletRequest; +import com.ccic.safeliab.entity.Customer; +import com.ccic.safeliab.entity.Grid; +import com.ccic.safeliab.entity.Organ; +import com.ccic.safeliab.entity.User; +import com.ccic.safeliab.exceptionhandler.CcicException; import com.ccic.safeliab.service.DemoService; import com.ccic.safeliab.support.Condition; +import com.ccic.safeliab.util.CcicUtill; +import com.ccic.safeliab.util.JwtUtils; import com.ccic.safeliab.util.R; import com.ccic.safeliab.vo.InsDemoVO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; @RestController @RequestMapping("/ex/demo") @@ -16,6 +27,7 @@ public class DemoController { @Autowired private DemoService service; + @GetMapping("/test") public R test() { return R.ok().data("success."); @@ -27,5 +39,25 @@ public class DemoController { return R.ok().data(service.list(Condition.getQueryWrapper(insDemoVO))); } + @PostMapping("testLogin") + public R testLogin(@RequestParam Map param) { + String jwtToken = JwtUtils.getJwtToken("42656085760282624", "测试626885", Long.parseLong("31010000"), + "上海分公司", "31010000", "8000626885", 3 + "", "310000"); + Map map = new HashMap<>(); + map.put("token", jwtToken); + return R.ok().data(map); + } + + +// @PostMapping("testLogin") +// public R testLogin(@RequestParam Map param) { +// User user = CcicUtill.mapToEntity(param, User.class); +// Map map = userService.login(user); +// if (map == null) { +// return R.error().message("账号错误,无此用户!").code(500); +// } +// return R.ok().data(map); +// } + } diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/web/DictController.java b/ccic-exam/src/main/java/com/ccic/safeliab/web/DictController.java index 99004d5..5eb8de3 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/web/DictController.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/web/DictController.java @@ -17,7 +17,7 @@ package com.ccic.safeliab.web; import com.ccic.safeliab.util.R; import com.ccic.safeliab.entity.ExDict; -import com.ccic.safeliab.service.DictService; +import com.ccic.safeliab.service.ExDictService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -33,7 +33,7 @@ import java.util.List; public class DictController { @Autowired - private DictService dictService; + private ExDictService exDictService; /** * 获取字典 @@ -42,7 +42,7 @@ public class DictController { */ @GetMapping("/dictionary") public R dictionary(String code) { - List tree = dictService.getList(code); + List tree = exDictService.getList(code); return R.ok().data(tree); }