From 4c2e20bf0daad9a26efe8dae571dfa9fa4a2fb2c Mon Sep 17 00:00:00 2001 From: caixiang <939387484@qq.com> Date: Thu, 30 Jun 2022 15:28:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E6=8E=89=E4=BA=86=20=EF=BC=8Cspc?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 - .../controller/ProductTypeController.java | 24 ++--- .../cnbm/basic/controller/UnitController.java | 68 ++++++------ .../com/cnbm/basic/dto/ProductTypeDTO.java | 2 +- .../main/java/com/cnbm/basic/dto/UnitDTO.java | 20 ++-- .../com/cnbm/basic/entity/ProductType.java | 4 +- .../main/java/com/cnbm/basic/entity/Unit.java | 27 +++-- .../cnbm/basic/excel/ProductTypeExcel.java | 2 +- .../java/com/cnbm/basic/excel/UnitExcel.java | 18 ++-- .../cnbm/basic/mapper/ProductTypeMapper.java | 2 +- .../cnbm/basic}/mapper/ProductTypeMapper.xml | 2 +- .../com/cnbm/basic/mapper/UnitMapper.java | 16 +++ .../com/cnbm/basic/mapper/UnitMapper.xml} | 2 +- .../basic/service/IProductTypeService.java | 2 +- .../com/cnbm/basic/service/IUnitService.java | 15 +++ .../service/impl/ProductTypeServiceImpl.java | 2 +- .../basic/service/impl/UnitServiceImpl.java | 34 ++++++ ym-barcode/pom.xml | 27 ----- .../listener/GlobalKeyListenerExample.java | 101 ------------------ ym-gateway/pom.xml | 10 -- .../generator/mapper/ProductTypeMapper.java | 16 --- .../service/IProductTypeService.java | 15 --- .../service/impl/ProductTypeServiceImpl.java | 34 ------ ym-websocket/pom.xml | 32 ------ .../websocket/config/WebSocketConfig.java | 20 ---- .../websocket/server/WebSocketServer.java | 79 -------------- .../cnbm/websocket/task/SendMessageTask.java | 37 ------- 27 files changed, 152 insertions(+), 461 deletions(-) rename ym-generator/src/main/java/com/cnbm/generator/controller/ProductTypeController.java => ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java (56%) rename ym-generator/src/main/java/com/cnbm/generator/dto/ProductTypeDTO.java => ym-baisc/src/main/java/com/cnbm/basic/dto/UnitDTO.java (77%) rename ym-generator/src/main/java/com/cnbm/generator/entity/ProductType.java => ym-baisc/src/main/java/com/cnbm/basic/entity/Unit.java (73%) rename ym-generator/src/main/java/com/cnbm/generator/excel/ProductTypeExcel.java => ym-baisc/src/main/java/com/cnbm/basic/excel/UnitExcel.java (78%) rename {ym-generator/src/main/java/com/cnbm/generator => ym-baisc/src/main/java/com/cnbm/basic}/mapper/ProductTypeMapper.xml (69%) create mode 100644 ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.java rename ym-baisc/src/main/{resources/mapper/ProductTypeMapper.xml => java/com/cnbm/basic/mapper/UnitMapper.xml} (71%) create mode 100644 ym-baisc/src/main/java/com/cnbm/basic/service/IUnitService.java create mode 100644 ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java delete mode 100644 ym-barcode/pom.xml delete mode 100644 ym-barcode/src/main/java/com/cnbm/barcode/listener/GlobalKeyListenerExample.java delete mode 100644 ym-generator/src/main/java/com/cnbm/generator/mapper/ProductTypeMapper.java delete mode 100644 ym-generator/src/main/java/com/cnbm/generator/service/IProductTypeService.java delete mode 100644 ym-generator/src/main/java/com/cnbm/generator/service/impl/ProductTypeServiceImpl.java delete mode 100644 ym-websocket/pom.xml delete mode 100644 ym-websocket/src/main/java/com/cnbm/websocket/config/WebSocketConfig.java delete mode 100644 ym-websocket/src/main/java/com/cnbm/websocket/server/WebSocketServer.java delete mode 100644 ym-websocket/src/main/java/com/cnbm/websocket/task/SendMessageTask.java diff --git a/pom.xml b/pom.xml index 2eb1471..e3d74d3 100644 --- a/pom.xml +++ b/pom.xml @@ -12,10 +12,8 @@ ym-admin ym-generator ym-gateway - ym-barcode ym-baisc ym-schedule-task - ym-websocket pom diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductTypeController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductTypeController.java index f9453e6..89a5328 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductTypeController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductTypeController.java @@ -31,10 +31,10 @@ import java.util.Map; * 产品类型 表 前端控制器 * * @author why - * @since 2022-06-21 + * @since 2022-06-30 */ @RestController -@RequestMapping("/basic/productType") +@RequestMapping("/code/productType") @Api(tags="产品类型 表") public class ProductTypeController { @Autowired @@ -43,12 +43,12 @@ public class ProductTypeController { @GetMapping("page") @ApiOperation("分页") @ApiImplicitParams({ - @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") , - @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") , - @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String") + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) }) -// @PreAuthorize("@ex.hasAuthority('basic:productType:page')") +// @PreAuthorize("@ex.hasAuthority('code:productType:page')") public Result> page(@ApiIgnore @RequestParam Map params){ PageData page = productTypeService.page(params); @@ -57,7 +57,7 @@ public class ProductTypeController { @GetMapping("{id}") @ApiOperation("信息") -// @PreAuthorize("@ex.hasAuthority('basic:productType:info')") +// @PreAuthorize("@ex.hasAuthority('code:productType:info')") public Result get(@PathVariable("id") Long id){ ProductTypeDTO data = productTypeService.get(id); @@ -67,7 +67,7 @@ public class ProductTypeController { @PostMapping @ApiOperation("保存") @LogOperation("保存") -// @PreAuthorize("@ex.hasAuthority('basic:productType:save')") +// @PreAuthorize("@ex.hasAuthority('code:productType:save')") public Result save(@RequestBody ProductTypeDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -80,7 +80,7 @@ public class ProductTypeController { @PutMapping @ApiOperation("修改") @LogOperation("修改") -// @PreAuthorize("@ex.hasAuthority('basic:productType:update')") +// @PreAuthorize("@ex.hasAuthority('code:productType:update')") public Result update(@RequestBody ProductTypeDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); @@ -93,7 +93,7 @@ public class ProductTypeController { @DeleteMapping @ApiOperation("删除") @LogOperation("删除") -// @PreAuthorize("@ex.hasAuthority('basic:productType:delete')") +// @PreAuthorize("@ex.hasAuthority('code:productType:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); @@ -106,7 +106,7 @@ public class ProductTypeController { @GetMapping("export") @ApiOperation("导出") @LogOperation("导出") -// @PreAuthorize("@ex.hasAuthority('basic:productType:export')") +// @PreAuthorize("@ex.hasAuthority('code:productType:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = productTypeService.list(params); diff --git a/ym-generator/src/main/java/com/cnbm/generator/controller/ProductTypeController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java similarity index 56% rename from ym-generator/src/main/java/com/cnbm/generator/controller/ProductTypeController.java rename to ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java index 74c8b90..e38624d 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/controller/ProductTypeController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java @@ -1,4 +1,4 @@ -package com.cnbm.generator.controller; +package com.cnbm.basic.controller; import com.cnbm.admin.annotation.LogOperation; import com.cnbm.common.constant.Constant; @@ -10,15 +10,15 @@ import com.cnbm.common.validator.ValidatorUtils; import com.cnbm.common.validator.group.AddGroup; import com.cnbm.common.validator.group.DefaultGroup; import com.cnbm.common.validator.group.UpdateGroup; -import com.cnbm.generator.dto.ProductTypeDTO; -import com.cnbm.generator.excel.ProductTypeExcel; -import com.cnbm.generator.service.IProductTypeService; +import com.cnbm.basic.dto.UnitDTO; +import com.cnbm.basic.excel.UnitExcel; +import com.cnbm.basic.service.IUnitService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -28,51 +28,51 @@ import java.util.Map; /** - * 产品类型 表 前端控制器 + * 单位 表 前端控制器 * * @author why - * @since 2022-06-21 + * @since 2022-06-30 */ @RestController -@RequestMapping("/generator/productType") -@Api(tags="产品类型 表") -public class ProductTypeController { +@RequestMapping("/code/unit") +@Api(tags="单位 表") +public class UnitController { @Autowired - private IProductTypeService productTypeService; + private IUnitService unitService; @GetMapping("page") @ApiOperation("分页") @ApiImplicitParams({ - @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") , - @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") , - @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String") + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) }) - @PreAuthorize("@ex.hasAuthority('generator:productType:page')") - public Result> page(@ApiIgnore @RequestParam Map params){ - PageData page = productTypeService.page(params); + @PreAuthorize("@ex.hasAuthority('code:unit:page')") + public Result> page(@ApiIgnore @RequestParam Map params){ + PageData page = unitService.page(params); - return new Result>().ok(page); + return new Result>().ok(page); } @GetMapping("{id}") @ApiOperation("信息") - @PreAuthorize("@ex.hasAuthority('generator:productType:info')") - public Result get(@PathVariable("id") Long id){ - ProductTypeDTO data = productTypeService.get(id); + @PreAuthorize("@ex.hasAuthority('code:unit:info')") + public Result get(@PathVariable("id") Long id){ + UnitDTO data = unitService.get(id); - return new Result().ok(data); + return new Result().ok(data); } @PostMapping @ApiOperation("保存") @LogOperation("保存") - @PreAuthorize("@ex.hasAuthority('generator:productType:save')") - public Result save(@RequestBody ProductTypeDTO dto){ + @PreAuthorize("@ex.hasAuthority('code:unit:save')") + public Result save(@RequestBody UnitDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - productTypeService.save(dto); + unitService.save(dto); return new Result(); } @@ -80,12 +80,12 @@ public class ProductTypeController { @PutMapping @ApiOperation("修改") @LogOperation("修改") - @PreAuthorize("@ex.hasAuthority('generator:productType:update')") - public Result update(@RequestBody ProductTypeDTO dto){ + @PreAuthorize("@ex.hasAuthority('code:unit:update')") + public Result update(@RequestBody UnitDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - productTypeService.update(dto); + unitService.update(dto); return new Result(); } @@ -93,12 +93,12 @@ public class ProductTypeController { @DeleteMapping @ApiOperation("删除") @LogOperation("删除") - @PreAuthorize("@ex.hasAuthority('generator:productType:delete')") + @PreAuthorize("@ex.hasAuthority('code:unit:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - productTypeService.delete(ids); + unitService.delete(ids); return new Result(); } @@ -106,11 +106,11 @@ public class ProductTypeController { @GetMapping("export") @ApiOperation("导出") @LogOperation("导出") - @PreAuthorize("@ex.hasAuthority('generator:productType:export')") + @PreAuthorize("@ex.hasAuthority('code:unit:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { - List list = productTypeService.list(params); + List list = unitService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ProductTypeExcel.class); + ExcelUtils.exportExcelToTarget(response, null, list, UnitExcel.class); } } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/dto/ProductTypeDTO.java b/ym-baisc/src/main/java/com/cnbm/basic/dto/ProductTypeDTO.java index 1949394..2a0edaf 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/dto/ProductTypeDTO.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/dto/ProductTypeDTO.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; * 产品类型 表 * * @author why - * @since 2022-06-21 + * @since 2022-06-30 */ @Data @ApiModel(value = "产品类型 表DTO对象") diff --git a/ym-generator/src/main/java/com/cnbm/generator/dto/ProductTypeDTO.java b/ym-baisc/src/main/java/com/cnbm/basic/dto/UnitDTO.java similarity index 77% rename from ym-generator/src/main/java/com/cnbm/generator/dto/ProductTypeDTO.java rename to ym-baisc/src/main/java/com/cnbm/basic/dto/UnitDTO.java index 1ebe97a..32be27d 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/dto/ProductTypeDTO.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/dto/UnitDTO.java @@ -1,23 +1,23 @@ -package com.cnbm.generator.dto; +package com.cnbm.basic.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.io.Serializable; +import java.math.BigDecimal; import java.time.LocalDateTime; /** - * 产品类型 表 + * 单位 表 * * @author why - * @since 2022-06-21 + * @since 2022-06-30 */ @Data -@ApiModel(value = "产品类型 表DTO对象") -public class ProductTypeDTO implements Serializable { +@ApiModel(value = "单位 表DTO对象") +public class UnitDTO implements Serializable { private static final long serialVersionUID = 1L; @@ -25,14 +25,14 @@ public class ProductTypeDTO implements Serializable { @ApiModelProperty(value = "ID") private BigDecimal id; - @ApiModelProperty(value = "产品类型 名") + @ApiModelProperty(value = "单位 名") private String name; - @ApiModelProperty(value = "产品类型 编码") + @ApiModelProperty(value = "单位 编码") private String code; - @ApiModelProperty(value = "描述") - private String desc; + @ApiModelProperty(value = "单位类型，1 可计数，2 不可计数") + private BigDecimal type; @ApiModelProperty(value = "1 可用，0 不可用") private BigDecimal status; diff --git a/ym-baisc/src/main/java/com/cnbm/basic/entity/ProductType.java b/ym-baisc/src/main/java/com/cnbm/basic/entity/ProductType.java index 0c40a90..c631a7b 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/entity/ProductType.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/entity/ProductType.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; *

* * @author why - * @since 2022-06-21 + * @since 2022-06-30 */ @Data @TableName("product_type") @@ -34,7 +34,7 @@ public class ProductType implements Serializable { private String code; @ApiModelProperty("描述") - private String desc; + private String descs; @ApiModelProperty("1 可用，0 不可用") private BigDecimal status; diff --git a/ym-generator/src/main/java/com/cnbm/generator/entity/ProductType.java b/ym-baisc/src/main/java/com/cnbm/basic/entity/Unit.java similarity index 73% rename from ym-generator/src/main/java/com/cnbm/generator/entity/ProductType.java rename to ym-baisc/src/main/java/com/cnbm/basic/entity/Unit.java index 6d62feb..1a6ec01 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/entity/ProductType.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/entity/Unit.java @@ -1,39 +1,38 @@ -package com.cnbm.generator.entity; +package com.cnbm.basic.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + /** *

- * 产品类型 表 + * 单位 表 *

* * @author why - * @since 2022-06-21 + * @since 2022-06-30 */ @Data -@TableName("product_type") -@ApiModel(value = "ProductType对象", description = "产品类型 表") -public class ProductType implements Serializable { +@ApiModel(value = "Unit对象", description = "单位 表") +public class Unit implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty("ID") private BigDecimal id; - @ApiModelProperty("产品类型 名") + @ApiModelProperty("单位 名") private String name; - @ApiModelProperty("产品类型 编码") + @ApiModelProperty("单位 编码") private String code; - @ApiModelProperty("描述") - private String desc; + @ApiModelProperty("单位类型，1 可计数，2 不可计数") + private BigDecimal type; @ApiModelProperty("1 可用，0 不可用") private BigDecimal status; diff --git a/ym-baisc/src/main/java/com/cnbm/basic/excel/ProductTypeExcel.java b/ym-baisc/src/main/java/com/cnbm/basic/excel/ProductTypeExcel.java index 5115240..f14bff6 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/excel/ProductTypeExcel.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/excel/ProductTypeExcel.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 产品类型 表 * * @author why - * @since 2022-06-21 + * @since 2022-06-30 */ @Data public class ProductTypeExcel { diff --git a/ym-generator/src/main/java/com/cnbm/generator/excel/ProductTypeExcel.java b/ym-baisc/src/main/java/com/cnbm/basic/excel/UnitExcel.java similarity index 78% rename from ym-generator/src/main/java/com/cnbm/generator/excel/ProductTypeExcel.java rename to ym-baisc/src/main/java/com/cnbm/basic/excel/UnitExcel.java index 6ad3ab6..f511c47 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/excel/ProductTypeExcel.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/excel/UnitExcel.java @@ -1,27 +1,27 @@ -package com.cnbm.generator.excel; +package com.cnbm.basic.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; + import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Date; /** - * 产品类型 表 + * 单位 表 * * @author why - * @since 2022-06-21 + * @since 2022-06-30 */ @Data -public class ProductTypeExcel { +public class UnitExcel { @Excel(name = "ID") private BigDecimal id; - @Excel(name = "产品类型 名") + @Excel(name = "单位 名") private String name; - @Excel(name = "产品类型 编码") + @Excel(name = "单位 编码") private String code; - @Excel(name = "描述") - private String desc; + @Excel(name = "单位类型，1 可计数，2 不可计数") + private BigDecimal type; @Excel(name = "1 可用，0 不可用") private BigDecimal status; @Excel(name = "备注") diff --git a/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java b/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java index 3efd03e..9248037 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 产品类型 表 * * @author why - * @since 2022-06-21 + * @since 2022-06-30 */ @Mapper public interface ProductTypeMapper extends BaseDao { diff --git a/ym-generator/src/main/java/com/cnbm/generator/mapper/ProductTypeMapper.xml b/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.xml similarity index 69% rename from ym-generator/src/main/java/com/cnbm/generator/mapper/ProductTypeMapper.xml rename to ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.xml index 816a329..3409746 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/mapper/ProductTypeMapper.xml +++ b/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.java b/ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.java new file mode 100644 index 0000000..8c6374e --- /dev/null +++ b/ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.java @@ -0,0 +1,16 @@ +package com.cnbm.basic.mapper; + +import com.cnbm.common.dao.BaseDao; +import com.cnbm.basic.entity.Unit; +import org.apache.ibatis.annotations.Mapper; + +/** + * 单位 表 + * + * @author why + * @since 2022-06-30 + */ +@Mapper +public interface UnitMapper extends BaseDao { + +} \ No newline at end of file diff --git a/ym-baisc/src/main/resources/mapper/ProductTypeMapper.xml b/ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.xml similarity index 71% rename from ym-baisc/src/main/resources/mapper/ProductTypeMapper.xml rename to ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.xml index 9dfb63c..42c18b6 100644 --- a/ym-baisc/src/main/resources/mapper/ProductTypeMapper.xml +++ b/ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java index b1eeba1..dcd5add 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java @@ -8,7 +8,7 @@ import com.cnbm.basic.entity.ProductType; * 产品类型 表 * * @author why - * @since 2022-06-21 + * @since 2022-06-30 */ public interface IProductTypeService extends CrudService { diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IUnitService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IUnitService.java new file mode 100644 index 0000000..47ccc7e --- /dev/null +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IUnitService.java @@ -0,0 +1,15 @@ +package com.cnbm.basic.service; + +import com.cnbm.common.service.CrudService; +import com.cnbm.basic.dto.UnitDTO; +import com.cnbm.basic.entity.Unit; + +/** + * 单位 表 + * + * @author why + * @since 2022-06-30 + */ +public interface IUnitService extends CrudService { + +} \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java index bdd04c7..f552426 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java @@ -15,7 +15,7 @@ import java.util.Map; * 产品类型 表 * * @author why - * @since 2022-06-21 + * @since 2022-06-30 */ @Service public class ProductTypeServiceImpl extends CrudServiceImpl implements IProductTypeService { diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java new file mode 100644 index 0000000..e5932eb --- /dev/null +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java @@ -0,0 +1,34 @@ +package com.cnbm.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.cnbm.common.service.impl.CrudServiceImpl; +import com.cnbm.basic.dto.UnitDTO; +import com.cnbm.basic.entity.Unit; +import com.cnbm.basic.mapper.UnitMapper; +import com.cnbm.basic.service.IUnitService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 单位 表 + * + * @author why + * @since 2022-06-30 + */ +@Service +public class UnitServiceImpl extends CrudServiceImpl implements IUnitService { + + @Override + public QueryWrapper getWrapper(Map params){ + String id = (String)params.get("id"); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), "id", id); + + return wrapper; + } + + +} \ No newline at end of file diff --git a/ym-barcode/pom.xml b/ym-barcode/pom.xml deleted file mode 100644 index 6a46802..0000000 --- a/ym-barcode/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - ym-pass - com.cnbm - 1.0-SNAPSHOT - - 4.0.0 - - ym-barcode - - - 8 - 8 - - - - - com.github.kwhat - jnativehook - 2.2.2 - - - - \ No newline at end of file diff --git a/ym-barcode/src/main/java/com/cnbm/barcode/listener/GlobalKeyListenerExample.java b/ym-barcode/src/main/java/com/cnbm/barcode/listener/GlobalKeyListenerExample.java deleted file mode 100644 index e031e4b..0000000 --- a/ym-barcode/src/main/java/com/cnbm/barcode/listener/GlobalKeyListenerExample.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.cnbm.barcode.listener; - -import com.github.kwhat.jnativehook.GlobalScreen; -import com.github.kwhat.jnativehook.NativeHookException; -import com.github.kwhat.jnativehook.keyboard.NativeKeyEvent; -import com.github.kwhat.jnativehook.keyboard.NativeKeyListener; -import lombok.extern.log4j.Log4j2; -import org.springframework.context.annotation.Profile; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -/** - * @Author weihongyang - * @Date 2022/6/20 4:08 PM - * @Version 1.0 - */ -@Log4j2 -@Component -@Profile("prod") -public class GlobalKeyListenerExample implements NativeKeyListener { - - static { - try { - GlobalScreen.registerNativeHook(); - } catch (NativeHookException e) { - throw new RuntimeException(e); - } - GlobalScreen.addNativeKeyListener(new GlobalKeyListenerExample()); - } - protected final static LinkedBlockingQueue queue = new LinkedBlockingQueue(); - - - public void nativeKeyPressed(NativeKeyEvent e) { - log.info("Key Pressed: " + NativeKeyEvent.getKeyText(e.getKeyCode())); - - try { - queue.put(e.getKeyCode()); - } catch (InterruptedException ex) { - ex.printStackTrace(); - } - log.info("queue的数据是："+queue.toString()); - int[] hotKeyArray1 = {NativeKeyEvent.VC_X, NativeKeyEvent.VC_Y,NativeKeyEvent.VC_Z}; - if (5 <= queue.size() && queue.size()<= 6 && e.getKeyCode() == NativeKeyEvent.VC_ENTER && judgeCombinationKey(hotKeyArray1)){ - String result = ""; - List collect = queue.stream().map(n -> { - return NativeKeyEvent.getKeyText(n); - }).collect(Collectors.toList()); - - if (queue.size() == 5) { - for (String s : collect) { - result = result + s; - } - }else { - for (int i = 1; i < collect.size(); i++) { - result = result + collect.get(i); - } - } - - log.info("符合标准的扫码是："+ result.replace("Enter","")); - queue.clear(); - } - if (queue.size() == 6){ - queue.poll(); - } - - if (e.getKeyCode() == NativeKeyEvent.VC_ESCAPE) { - try { - GlobalScreen.unregisterNativeHook(); - } catch (NativeHookException nativeHookException) { - nativeHookException.printStackTrace(); - } - } - } - protected Boolean judgeCombinationKey(int[] hotKeyArray){ - Object[] queueKey = queue.toArray(); - - Predicate keyArrayPredicateOne = hotKeies -> (int)queueKey[0] == hotKeies[0] - && (int)queueKey[1] == hotKeies[1] - && (int)queueKey[2] == hotKeies[2]; - - Predicate keyArrayPredicateTwo = hotKeies -> (int)queueKey[1] == hotKeies[0] - && (int)queueKey[2] == hotKeies[1] - && (int)queueKey[3] == hotKeies[2]; - - return queue.size() == 3 ? keyArrayPredicateOne.test(hotKeyArray) : - keyArrayPredicateOne.or(keyArrayPredicateTwo).test(hotKeyArray); - - } - - public void nativeKeyReleased(NativeKeyEvent e) { - log.info("Key Released: " + NativeKeyEvent.getKeyText(e.getKeyCode())); - } - - public void nativeKeyTyped(NativeKeyEvent e) { - log.info("Key Typed: " + e.getKeyText(e.getKeyCode())); - } -} diff --git a/ym-gateway/pom.xml b/ym-gateway/pom.xml index bc2af8f..2200520 100644 --- a/ym-gateway/pom.xml +++ b/ym-gateway/pom.xml @@ -27,11 +27,6 @@ ym-admin 1.0-SNAPSHOT - - com.cnbm - ym-barcode - 1.0-SNAPSHOT - com.cnbm ym-baisc @@ -42,11 +37,6 @@ ym-schedule-task 1.0-SNAPSHOT - - com.cnbm - ym-websocket - 1.0-SNAPSHOT - io.springfox springfox-boot-starter diff --git a/ym-generator/src/main/java/com/cnbm/generator/mapper/ProductTypeMapper.java b/ym-generator/src/main/java/com/cnbm/generator/mapper/ProductTypeMapper.java deleted file mode 100644 index c33c3d7..0000000 --- a/ym-generator/src/main/java/com/cnbm/generator/mapper/ProductTypeMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cnbm.generator.mapper; - -import com.cnbm.common.dao.BaseDao; -import com.cnbm.generator.entity.ProductType; -import org.apache.ibatis.annotations.Mapper; - -/** - * 产品类型 表 - * - * @author why - * @since 2022-06-21 - */ -@Mapper -public interface ProductTypeMapper extends BaseDao { - -} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/service/IProductTypeService.java b/ym-generator/src/main/java/com/cnbm/generator/service/IProductTypeService.java deleted file mode 100644 index 08e6221..0000000 --- a/ym-generator/src/main/java/com/cnbm/generator/service/IProductTypeService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cnbm.generator.service; - -import com.cnbm.common.service.CrudService; -import com.cnbm.generator.dto.ProductTypeDTO; -import com.cnbm.generator.entity.ProductType; - -/** - * 产品类型 表 - * - * @author why - * @since 2022-06-21 - */ -public interface IProductTypeService extends CrudService { - -} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/service/impl/ProductTypeServiceImpl.java b/ym-generator/src/main/java/com/cnbm/generator/service/impl/ProductTypeServiceImpl.java deleted file mode 100644 index 1572dd0..0000000 --- a/ym-generator/src/main/java/com/cnbm/generator/service/impl/ProductTypeServiceImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cnbm.generator.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cnbm.common.service.impl.CrudServiceImpl; -import com.cnbm.generator.dto.ProductTypeDTO; -import com.cnbm.generator.mapper.ProductTypeMapper; -import com.cnbm.generator.entity.ProductType; -import com.cnbm.generator.service.IProductTypeService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 产品类型 表 - * - * @author why - * @since 2022-06-21 - */ -@Service -public class ProductTypeServiceImpl extends CrudServiceImpl implements IProductTypeService { - - @Override - public QueryWrapper getWrapper(Map params){ - String id = (String)params.get("id"); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), "id", id); - - return wrapper; - } - - -} \ No newline at end of file diff --git a/ym-websocket/pom.xml b/ym-websocket/pom.xml deleted file mode 100644 index 0f30458..0000000 --- a/ym-websocket/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - ym-pass - com.cnbm - 1.0-SNAPSHOT - - 4.0.0 - - ym-websocket - - - 8 - 8 - - - - - - com.cnbm - ym-schedule-task - 1.0-SNAPSHOT - - - org.springframework.boot - spring-boot-starter-websocket - - - - \ No newline at end of file diff --git a/ym-websocket/src/main/java/com/cnbm/websocket/config/WebSocketConfig.java b/ym-websocket/src/main/java/com/cnbm/websocket/config/WebSocketConfig.java deleted file mode 100644 index 8180af6..0000000 --- a/ym-websocket/src/main/java/com/cnbm/websocket/config/WebSocketConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cnbm.websocket.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.config.annotation.EnableWebSocket; -import org.springframework.web.socket.server.standard.ServerEndpointExporter; - -/** - * @Author weihongyang - * @Date 2022/6/29 8:58 AM - * @Version 1.0 - */ -@Configuration -@EnableWebSocket -public class WebSocketConfig { - @Bean - public ServerEndpointExporter serverEndpoint(){ - return new ServerEndpointExporter(); - } -} diff --git a/ym-websocket/src/main/java/com/cnbm/websocket/server/WebSocketServer.java b/ym-websocket/src/main/java/com/cnbm/websocket/server/WebSocketServer.java deleted file mode 100644 index 3f381db..0000000 --- a/ym-websocket/src/main/java/com/cnbm/websocket/server/WebSocketServer.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.cnbm.websocket.server; - -import lombok.extern.log4j.Log4j2; -import org.springframework.stereotype.Component; - -import javax.websocket.OnClose; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; -import java.io.IOException; -import java.util.concurrent.ConcurrentHashMap; - -/** - * @Author weihongyang - * @Date 2022/6/29 8:59 AM - * @Version 1.0 - */ -@Log4j2 -@Component -@ServerEndpoint("/websocket/info") // 指定websocket 连接的url -public class WebSocketServer { - - private static int onlineCount = 0; - - public static ConcurrentHashMap webSocketMap = new ConcurrentHashMap<>(); - - private Session session; - - private String sessionId; - - @OnOpen - public void onOpen(Session session) { - log.info("客户端：{}连接成功",session.getId()); - this.session = session; - this.sessionId = session.getId(); - if (webSocketMap.containsKey(session.getId())){ - webSocketMap.remove(sessionId); - webSocketMap.put(sessionId,this); - }else { - webSocketMap.put(sessionId,this); - addOnlineCount(); - } - } - - @OnClose - public void onClose(Session session) { - if (webSocketMap.containsKey(sessionId)) { - webSocketMap.remove(sessionId); - subOnlineCount(); - } - log.info("客户端：{}连接断开",session.getId()); - } - - @OnMessage - public String onMsg(String message,Session session) { - log.info("从客户端：{} 收到<--:{}", session.getId(),message); - - String send=message.toUpperCase(); - String result="客户：%s您好，来自server 的消息:%s"; - result = String.format(result, session.getId(), send); - return "来自server 的消息：" + result; - } - - public void sendMsg(String message) throws IOException{ - this.session.getBasicRemote().sendText(message); - } - - private static synchronized void addOnlineCount() { - WebSocketServer.onlineCount++; - } - - private static synchronized void subOnlineCount() { - WebSocketServer.onlineCount--; - } - - -} - diff --git a/ym-websocket/src/main/java/com/cnbm/websocket/task/SendMessageTask.java b/ym-websocket/src/main/java/com/cnbm/websocket/task/SendMessageTask.java deleted file mode 100644 index 0601de2..0000000 --- a/ym-websocket/src/main/java/com/cnbm/websocket/task/SendMessageTask.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.cnbm.websocket.task; - -import com.cnbm.scheduletask.task.ITask; -import com.cnbm.websocket.server.WebSocketServer; -import lombok.extern.log4j.Log4j2; -import org.springframework.stereotype.Component; - -import java.io.IOException; -import java.util.Date; -import java.util.Iterator; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * @Author weihongyang - * @Date 2022/6/29 2:01 PM - * @Version 1.0 - */ -@Log4j2 -@Component("sendMessageTask") -public class SendMessageTask implements ITask { - public void run(String params) { - - Iterator> socketIt = WebSocketServer.webSocketMap.entrySet().iterator(); - - - while (socketIt.hasNext()) { - Map.Entry socketServerEntry = socketIt.next(); - try { - socketServerEntry.getValue().sendMsg("定时发送："+new Date().toString()); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - log.info("sendMessageTask定时任务正在执行，参数为：{}", params); - } -}