From 5a0084306a6b73d35b388ef2009cf439494e2934 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Tue, 6 Aug 2024 17:19:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=83=A8=E9=97=A8=E8=A7=A3?= =?UTF-8?q?=E5=AF=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/app/entity/BoxEntity.java | 31 +++++++++++ .../com/bonus/app/entity/BraceletEntity.java | 33 ++++++++++++ .../gateway/filter/ResponseEncryptFilter.java | 9 ++-- .../handler/GatewayExceptionHandler.java | 2 +- .../src/main/resources/bootstrap.yml | 4 +- .../com/bonus/app/BonusAppApplication.java | 3 +- .../java/com/bonus/app/config/RoleConfig.java | 16 ++++++ .../app/controller/BraceletController.java | 52 +++++++++++++++++++ .../com/bonus/app/mapper/BraceletMapper.java | 19 +++++++ .../bonus/app/service/BraceletService.java | 21 ++++++++ .../app/service/BraceletServiceImpl.java | 39 ++++++++++++++ .../main/resources/mapper/BraceletMapper.xml | 12 ++++- 12 files changed, 233 insertions(+), 8 deletions(-) create mode 100644 bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/BoxEntity.java create mode 100644 bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/BraceletEntity.java create mode 100644 bonus-modules/bonus-app/src/main/java/com/bonus/app/config/RoleConfig.java create mode 100644 bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/BraceletController.java create mode 100644 bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/BraceletMapper.java create mode 100644 bonus-modules/bonus-app/src/main/java/com/bonus/app/service/BraceletService.java create mode 100644 bonus-modules/bonus-app/src/main/java/com/bonus/app/service/BraceletServiceImpl.java diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/BoxEntity.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/BoxEntity.java new file mode 100644 index 0000000..1799859 --- /dev/null +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/BoxEntity.java @@ -0,0 +1,31 @@ +package com.bonus.app.entity; + +import lombok.Data; + +/** + * 手环箱实体类 + */ +@Data +public class BoxEntity { + + + /** + * 箱子名称 + */ + private String boxName; + /** + * 箱子低 + */ + private String boxId; + /** + * 用户id + */ + private long userId; + /** + * 角色编码 + */ + private String roleCode; + + + private long teamId; +} diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/BraceletEntity.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/BraceletEntity.java new file mode 100644 index 0000000..17242e3 --- /dev/null +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/BraceletEntity.java @@ -0,0 +1,33 @@ +package com.bonus.app.entity; + +import lombok.Data; + +/** + * 手环领用 + */ +@Data +public class BraceletEntity { + /** + * 设备id + */ + private String id; + + /** + * 手环发放的数量 + */ + private int boxNum; + + /** + * 总容量 + */ + private int boxCapacity; + + /** + * 用户id + */ + private String userId; + + + + +} diff --git a/bonus-gateway/src/main/java/com/bonus/gateway/filter/ResponseEncryptFilter.java b/bonus-gateway/src/main/java/com/bonus/gateway/filter/ResponseEncryptFilter.java index debc7c1..8857a7f 100644 --- a/bonus-gateway/src/main/java/com/bonus/gateway/filter/ResponseEncryptFilter.java +++ b/bonus-gateway/src/main/java/com/bonus/gateway/filter/ResponseEncryptFilter.java @@ -77,9 +77,9 @@ public class ResponseEncryptFilter implements GlobalFilter, Ordered { return chain.filter(exchange); } //是否加密 - if(!jaData){ - return chain.filter(exchange); - } +// if(!jaData){ +// return chain.filter(exchange); +// } // 根据具体业务内容，修改响应体 return modifyResponseBody(exchange, chain); } @@ -121,7 +121,8 @@ public class ResponseEncryptFilter implements GlobalFilter, Ordered { Map map = JSON.parseObject(responseData); Object encrypt = map.get(SystemGlobal.KEY_DECRYPT); Map maps= Maps.newHashMap(); - if(encrypt==null || encrypt=="" || SystemGlobal.TRUE_STR.equals(encrypt)){ + //加密则数据 进行加密 + if(jaData){ responseData = AesCbcUtils.encrypt(JSON.toJSONString(map)); maps.put("data",responseData); maps.put(SystemGlobal.KEY_DECRYPT,true); diff --git a/bonus-gateway/src/main/java/com/bonus/gateway/handler/GatewayExceptionHandler.java b/bonus-gateway/src/main/java/com/bonus/gateway/handler/GatewayExceptionHandler.java index f365903..24cf32a 100644 --- a/bonus-gateway/src/main/java/com/bonus/gateway/handler/GatewayExceptionHandler.java +++ b/bonus-gateway/src/main/java/com/bonus/gateway/handler/GatewayExceptionHandler.java @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest; @Configuration public class GatewayExceptionHandler implements ErrorWebExceptionHandler { - @Value("${system.jie-enable}") + @Value("${system.jia-enable}") public boolean jaData; diff --git a/bonus-gateway/src/main/resources/bootstrap.yml b/bonus-gateway/src/main/resources/bootstrap.yml index 04e7a8e..2225d83 100644 --- a/bonus-gateway/src/main/resources/bootstrap.yml +++ b/bonus-gateway/src/main/resources/bootstrap.yml @@ -48,8 +48,10 @@ spring: rule-type: gw-flow #系统 自动 加解密开关 system: + #返回数据加密 jia-enable: false - jie-enable: false + # 接收数据解密 + jie-enable: true #加密组件 jasypt: encryptor: diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/BonusAppApplication.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/BonusAppApplication.java index 7566732..d6de6dd 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/BonusAppApplication.java +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/BonusAppApplication.java @@ -5,11 +5,12 @@ import com.bonus.common.security.annotation.EnableRyFeignClients; import com.bonus.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; @EnableCustomConfig @EnableCustomSwagger2 @EnableRyFeignClients -@SpringBootApplication +@SpringBootApplication(exclude = MongoAutoConfiguration.class) public class BonusAppApplication { public static void main(String[] args) { SpringApplication.run(BonusAppApplication.class, args); diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/config/RoleConfig.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/config/RoleConfig.java new file mode 100644 index 0000000..2dce7b8 --- /dev/null +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/config/RoleConfig.java @@ -0,0 +1,16 @@ +package com.bonus.app.config; + +public enum RoleConfig { + + TEAM("team"),DEPART("depart"); + + private final String roleCode; + + RoleConfig(String roleCode) { + this.roleCode = roleCode; + } + + public String getRoleCode() { + return roleCode; + } +} diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/BraceletController.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/BraceletController.java new file mode 100644 index 0000000..e972a5d --- /dev/null +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/BraceletController.java @@ -0,0 +1,52 @@ +package com.bonus.app.controller; + +import com.bonus.app.entity.BoxEntity; +import com.bonus.app.entity.BraceletEntity; +import com.bonus.app.service.BraceletService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 手环管理模块 + * APP + */ +@RestController +@RequestMapping("/bracelet/") +@Slf4j +public class BraceletController extends BaseController{ + + + @Autowired + private BraceletService service; + + /** + * 查询班组 + * 所领取的手环箱 + * @param entity + * @return + */ + @GetMapping("getBoxListById") + @SysLog(title = "手环管理", businessType = OperaType.QUERY, module = "基础管理->手环管理", details = "查询手环列表") + public AjaxResult getBoxListById(BoxEntity entity) { + List list = service.getBoxListById(entity); + return AjaxResult.success(list); + + } + + + + + + +} diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/BraceletMapper.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/BraceletMapper.java new file mode 100644 index 0000000..7642ec6 --- /dev/null +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/BraceletMapper.java @@ -0,0 +1,19 @@ +package com.bonus.app.mapper; + +import com.bonus.app.entity.BoxEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 手环管理 数据层 + */ +@Mapper +public interface BraceletMapper { + /** + * 查询班组下拉选集合 + * @param entity + * @return + */ + List getBoxListById(BoxEntity entity); +} diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/BraceletService.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/BraceletService.java new file mode 100644 index 0000000..37d648c --- /dev/null +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/BraceletService.java @@ -0,0 +1,21 @@ +package com.bonus.app.service; + +import com.bonus.app.entity.BoxEntity; +import com.bonus.app.entity.BraceletEntity; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * APP 手环管理 + */ + +public interface BraceletService { + + /** + * 查询手环箱数据 + * @param entity + * @return + */ + List getBoxListById(BoxEntity entity); +} diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/BraceletServiceImpl.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/BraceletServiceImpl.java new file mode 100644 index 0000000..9d74cea --- /dev/null +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/BraceletServiceImpl.java @@ -0,0 +1,39 @@ +package com.bonus.app.service; + +import com.bonus.app.config.RoleConfig; +import com.bonus.app.entity.BoxEntity; +import com.bonus.app.entity.BraceletEntity; +import com.bonus.app.mapper.BraceletMapper; +import com.bonus.common.security.utils.SecurityUtils; +import com.bonus.system.api.model.LoginUser; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * app 接口实现层 + */ +@Service +@Slf4j +public class BraceletServiceImpl implements BraceletService{ + + @Autowired + private BraceletMapper mapper; + @Override + public List getBoxListById(BoxEntity entity) { + try{ + LoginUser loginUser= SecurityUtils.getLoginUser(); + String teamCode=loginUser.getSysUser().getRoleCode(); + entity.setRoleCode(teamCode); + entity.setTeamId(loginUser.getSysUser().getTeamId()); + List list=mapper.getBoxListById(entity); + return list; + }catch (Exception e){ + log.error(e.toString()); + } + return new ArrayList<>(); + } +} diff --git a/bonus-modules/bonus-app/src/main/resources/mapper/BraceletMapper.xml b/bonus-modules/bonus-app/src/main/resources/mapper/BraceletMapper.xml index 19e13f7..3aa042a 100644 --- a/bonus-modules/bonus-app/src/main/resources/mapper/BraceletMapper.xml +++ b/bonus-modules/bonus-app/src/main/resources/mapper/BraceletMapper.xml @@ -2,6 +2,16 @@ - + + + + \ No newline at end of file