From 5c31bba5313042751b000e2f3a3b5e32e6d39136 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 21 Sep 2020 17:05:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=EF=BC=8C=E5=93=81=E7=89=8C=E7=AD=89=E7=AE=A1=E7=90=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/config/ShiroConfig.java | 1 + .../controller/EquipmentBrandController.java | 7 ++ .../controller/EquipmentInfoController.java | 16 ++++- .../controller/EquipmentSpecsController.java | 30 ++++++++- .../equipment/dao/EquipmentBrandMapper.java | 2 +- .../equipment/dao/EquipmentInfoMapper.java | 2 +- .../equipment/dao/EquipmentSpecsMapper.java | 2 +- .../equipment/dao/EquipmentTypeMapper.java | 2 +- .../impl/EquipmentInfoServiceImpl.java | 3 + .../mapper/equipment/EquipmentBrandMapper.xml | 6 +- .../mapper/equipment/EquipmentInfoMapper.xml | 66 +++++++++---------- .../mapper/equipment/EquipmentSpecsMapper.xml | 10 +-- .../mapper/equipment/EquipmentTypeMapper.xml | 4 +- .../mapper/equipment/TCountMapper.xml | 14 ++-- 14 files changed, 105 insertions(+), 60 deletions(-) diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index bd108625..26e4c61d 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -65,6 +65,7 @@ public class ShiroConfig { filterMap.put("/aaa.txt", "anon"); filterMap.put("/dtlg/login", "anon"); filterMap.put("/oneCode/**", "anon"); + filterMap.put("/modules/**", "anon");//临时添加，后期去掉 filterMap.put("/dtlg/luck", "anon"); filterMap.put("/dtlg/look", "anon"); filterMap.put("/dtlg/jump", "anon"); diff --git a/src/main/java/com/lz/modules/equipment/controller/EquipmentBrandController.java b/src/main/java/com/lz/modules/equipment/controller/EquipmentBrandController.java index 437edf22..87e385d5 100644 --- a/src/main/java/com/lz/modules/equipment/controller/EquipmentBrandController.java +++ b/src/main/java/com/lz/modules/equipment/controller/EquipmentBrandController.java @@ -139,11 +139,18 @@ public class EquipmentBrandController { EquipmentType type = map.get(brand.getTypeId()); if(type !=null){ resp.setTypeName(type.getType()); + }else{ + resp.setTypeName("【分类被删】"); } resps.add(resp); } + EquipmentType type = new EquipmentType(); + type.setId(null); + type.setType("全部"); + equipmentTypes.add(0, type); return R.ok().put("total", page.getTotalCount()) .put("rows", resps) + .put("types", equipmentTypes) ; } diff --git a/src/main/java/com/lz/modules/equipment/controller/EquipmentInfoController.java b/src/main/java/com/lz/modules/equipment/controller/EquipmentInfoController.java index 90ff93f3..22a1f390 100644 --- a/src/main/java/com/lz/modules/equipment/controller/EquipmentInfoController.java +++ b/src/main/java/com/lz/modules/equipment/controller/EquipmentInfoController.java @@ -41,6 +41,7 @@ public class EquipmentInfoController { private TCountService tCountService; + /** * 添加设备表页面 * @@ -104,13 +105,13 @@ public class EquipmentInfoController { public R equipmentInfoEdit(@RequestBody EquipmentInfoReq req) throws Exception { EquipmentInfo equipmentInfo = equipmentInfoService.selectEquipmentInfoById(req.getId()); BeanUtils.copyProperty(equipmentInfo, req, true); - Long typeId = NumberUtil.objToLongDefault(equipmentInfo.getType(), 0); + /*Long typeId = NumberUtil.objToLongDefault(equipmentInfo.getType(), 0); EquipmentType type = equipmentTypeService.selectEquipmentTypeById(typeId); equipmentInfo.setType(type.getType()); Long brandId = NumberUtil.objToLongDefault(equipmentInfo.getBrandName(), 0); EquipmentBrand equipmentBrand = equipmentBrandService.selectEquipmentBrandById(brandId); - equipmentInfo.setBrandName(equipmentBrand.getBrand()); + equipmentInfo.setBrandName(equipmentBrand.getBrand());*/ equipmentInfoService.updateEquipmentInfoById(equipmentInfo); return R.ok("编辑成功"); } @@ -149,8 +150,17 @@ public class EquipmentInfoController { */ @RequestMapping(value = "/modules/usereq/equipmentInfoList") public R equipmentInfoList(@RequestBody EquipmentInfoReq req) throws Exception { + List types = equipmentTypeService.selectAll(); + List tcounts = tCountService.selectListLimit(10); + EquipmentType type = new EquipmentType(); + type.setId(null); + type.setType("全部"); + types.add(0, type); PageUtils page = equipmentInfoService.selectByCondition(req); return R.ok().put("total", page.getTotalCount()) - .put("rows", page.getList()); + .put("rows", page.getList()) + .put("types", types) + .put("tCounts", tcounts) + .put("curCount", req.getCount()); } } diff --git a/src/main/java/com/lz/modules/equipment/controller/EquipmentSpecsController.java b/src/main/java/com/lz/modules/equipment/controller/EquipmentSpecsController.java index eafdc2b9..0367dfe0 100644 --- a/src/main/java/com/lz/modules/equipment/controller/EquipmentSpecsController.java +++ b/src/main/java/com/lz/modules/equipment/controller/EquipmentSpecsController.java @@ -129,6 +129,11 @@ public class EquipmentSpecsController { @RequestMapping(value = "/modules/specs/brandList") public R brandList(@RequestBody EquipmentSpecsReq req) throws Exception { List brands = equipmentBrandService.selectByTypeId(req.getTypeId()); + EquipmentBrand band = new EquipmentBrand(); + band.setId(null); + band.setTypeId(null); + band.setBrand("全部"); + brands.add(0, band); return R.ok().put("brands",brands); } @@ -157,8 +162,22 @@ public class EquipmentSpecsController { for (EquipmentSpecs specs : specsList) { EquipmentSpecsResp resp = new EquipmentSpecsResp(); resp.setId(specs.getId()); - resp.setType(typeMap.get(specs.getTypeId()).getType()); - resp.setBrand(brandMap.get(specs.getBrandId()).getBrand()); + EquipmentType type = typeMap.get(specs.getTypeId()); + if(type == null){ + resp.setType("【分类被删】"); + }else{ + resp.setType(type.getType()); + resp.setTypeId(type.getId()); + } + + EquipmentBrand brand = brandMap.get(specs.getBrandId()); + if(brand == null){ + resp.setBrand("【品牌被删】"); + }else{ + resp.setBrand(brand.getBrand()); + resp.setBrandId(brand.getId()); + } + resp.setSpecs(specs.getSpecs()); resp.setRank(specs.getRank()); resp.setSkus(specs.getSkus()); @@ -166,7 +185,12 @@ public class EquipmentSpecsController { resp.setRemark(specs.getRemark()); resps.add(resp); } + EquipmentType type = new EquipmentType(); + type.setId(null); + type.setType("全部"); + types.add(0, type); return R.ok().put("total", page.getTotalCount()) - .put("rows", resps); + .put("rows", resps) + .put("types", types); } } diff --git a/src/main/java/com/lz/modules/equipment/dao/EquipmentBrandMapper.java b/src/main/java/com/lz/modules/equipment/dao/EquipmentBrandMapper.java index 81d2643e..682facb2 100644 --- a/src/main/java/com/lz/modules/equipment/dao/EquipmentBrandMapper.java +++ b/src/main/java/com/lz/modules/equipment/dao/EquipmentBrandMapper.java @@ -38,7 +38,7 @@ public interface EquipmentBrandMapper extends BaseMapper { EquipmentBrand selectEquipmentBrandByTypeBrand(@Param("typeId") Long typeId, @Param("brand") String brand); - List selectByCondition(IPage page, EquipmentBrandReq req); + List selectByCondition(@Param("page") IPage page, @Param("req") EquipmentBrandReq req); List selectEquipmentBrandByTypeAndLikeBrand(@Param("typeId") Long typeId, @Param("brand") String brand); List selectAll(); diff --git a/src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java b/src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java index 95118845..95080d38 100644 --- a/src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java +++ b/src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java @@ -39,7 +39,7 @@ public interface EquipmentInfoMapper extends BaseMapper { EquipmentInfo selectEquipmentInfoByCode(@Param("code") String code); - List selectByCondition(IPage page, EquipmentInfoReq req); + List selectByCondition(@Param("page") IPage page, @Param("req") EquipmentInfoReq req); List selectByStaffIdOrDepId(@Param("page") IPage page, @Param("nameModel") FindEquipmentsByNameModel nameModel); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/equipment/dao/EquipmentSpecsMapper.java b/src/main/java/com/lz/modules/equipment/dao/EquipmentSpecsMapper.java index c1a9eeb6..e7d672d4 100644 --- a/src/main/java/com/lz/modules/equipment/dao/EquipmentSpecsMapper.java +++ b/src/main/java/com/lz/modules/equipment/dao/EquipmentSpecsMapper.java @@ -37,7 +37,7 @@ public interface EquipmentSpecsMapper extends BaseMapper { EquipmentSpecs selectEquipmentSpecsByTypeBrandSpecss(@Param("typeId") Long typeId, @Param("brandId") Long brandId, @Param("specs") String specs); - List selectByCondition(IPage page, EquipmentSpecsReq req); + List selectByCondition(@Param("page") IPage page, @Param("req") EquipmentSpecsReq req); List selectEquipmentSpecsByTypeBrandLikeSpecss(@Param("typeId") Long typeId, @Param("brandId") Long brandId, @Param("specs") String specs); EquipmentSpecs selectSpecs(@Param("specs") String specs); diff --git a/src/main/java/com/lz/modules/equipment/dao/EquipmentTypeMapper.java b/src/main/java/com/lz/modules/equipment/dao/EquipmentTypeMapper.java index 3ce27d1d..1ab3ddf2 100644 --- a/src/main/java/com/lz/modules/equipment/dao/EquipmentTypeMapper.java +++ b/src/main/java/com/lz/modules/equipment/dao/EquipmentTypeMapper.java @@ -41,7 +41,7 @@ public interface EquipmentTypeMapper extends BaseMapper { List selectByType(@Param("type") String type); - List selectByCondition(IPage page, EquipmentTypeReq req); + List selectByCondition(@Param("page") IPage page, @Param("req") EquipmentTypeReq req); List selectAll(); diff --git a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java index 69db429a..5f75109e 100644 --- a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java +++ b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java @@ -16,6 +16,7 @@ import com.lz.modules.equipment.entity.model.FindByNameModel; import com.lz.modules.equipment.entity.model.FindEquipmentsByNameModel; import com.lz.modules.equipment.service.IEquipmentInfoService; import com.lz.modules.sys.entity.SysUserEntity; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,6 +34,7 @@ import java.util.List; */ @Service +@Slf4j public class EquipmentInfoServiceImpl extends ServiceImpl implements IEquipmentInfoService { @@ -98,6 +100,7 @@ public class EquipmentInfoServiceImpl extends ServiceImpl select * from equipment_brand where is_delete = 0 - and type_id = #{typeId} - - AND brand LIKE CONCAT('%',#{brand},'%') + and type_id = #{req.typeId} + + AND brand LIKE CONCAT('%',#{req.brand},'%') order by rank desc , id desc diff --git a/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml index f4c25a4c..8fe03d64 100644 --- a/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml +++ b/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml @@ -171,60 +171,60 @@ - select * from equipment_specs where is_delete = 0 - and type_id = #{typeId} - and brand_id = #{brandId} - - AND specs LIKE CONCAT('%',#{specs},'%') + and type_id = #{req.typeId} + and brand_id = #{req.brandId} + + AND specs LIKE CONCAT('%',#{req.specs},'%') order by rank desc, id desc diff --git a/src/main/resources/mapper/equipment/EquipmentTypeMapper.xml b/src/main/resources/mapper/equipment/EquipmentTypeMapper.xml index d605a5ce..df0ff4aa 100644 --- a/src/main/resources/mapper/equipment/EquipmentTypeMapper.xml +++ b/src/main/resources/mapper/equipment/EquipmentTypeMapper.xml @@ -95,8 +95,8 @@ - select * from t_count where id=#{id} and is_delete = 0 limit 1 + select * from equipment_t_count where id=#{id} and is_delete = 0 limit 1 - insert into t_count( + insert into equipment_t_count( num, is_delete, gmt_create, @@ -42,7 +42,7 @@ update - t_count + equipment_t_count is_delete = #{isDelete}, gmt_create = #{gmtCreate}, @@ -55,7 +55,7 @@ update - t_count + equipment_t_count set is_delete = #{isDelete}, gmt_create = #{gmtCreate}, @@ -66,14 +66,14 @@ - update t_count set is_delete = 1 where id=#{id} limit 1 + update equipment_t_count set is_delete = 1 where id=#{id} limit 1 From 0033e7a266156d9ce368185b79f5705b74b1c82e Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 22 Sep 2020 14:46:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=9B=B8=E5=85=B3=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EquipmentInfoController.java | 2 +- .../controller/OneCodeController.java | 13 ++++++++ .../modules/equipment/dao/OneCodeMapper.java | 4 +++ .../modules/equipment/entity/OneCodeReq.java | 33 +++++++++++++++++++ .../equipment/service/OneCodeService.java | 4 +++ .../service/impl/OneCodeServiceImpl.java | 10 ++++++ .../mapper/equipment/OneCodeMapper.xml | 7 ++++ 7 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/lz/modules/equipment/entity/OneCodeReq.java diff --git a/src/main/java/com/lz/modules/equipment/controller/EquipmentInfoController.java b/src/main/java/com/lz/modules/equipment/controller/EquipmentInfoController.java index 22a1f390..0b728beb 100644 --- a/src/main/java/com/lz/modules/equipment/controller/EquipmentInfoController.java +++ b/src/main/java/com/lz/modules/equipment/controller/EquipmentInfoController.java @@ -105,7 +105,7 @@ public class EquipmentInfoController { public R equipmentInfoEdit(@RequestBody EquipmentInfoReq req) throws Exception { EquipmentInfo equipmentInfo = equipmentInfoService.selectEquipmentInfoById(req.getId()); BeanUtils.copyProperty(equipmentInfo, req, true); - /*Long typeId = NumberUtil.objToLongDefault(equipmentInfo.getType(), 0); + /*Long typeId = NumberUtil.objToLongDefault(equipmentInfo.getType(), 0);//20200921注释掉，后台不支持修改类型，品牌等，只能修改备注，时间，金额 EquipmentType type = equipmentTypeService.selectEquipmentTypeById(typeId); equipmentInfo.setType(type.getType()); diff --git a/src/main/java/com/lz/modules/equipment/controller/OneCodeController.java b/src/main/java/com/lz/modules/equipment/controller/OneCodeController.java index c055a921..8a3e0857 100644 --- a/src/main/java/com/lz/modules/equipment/controller/OneCodeController.java +++ b/src/main/java/com/lz/modules/equipment/controller/OneCodeController.java @@ -1,9 +1,11 @@ package com.lz.modules.equipment.controller; +import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; import com.lz.modules.equipment.entity.OneCode; +import com.lz.modules.equipment.entity.OneCodeReq; import com.lz.modules.equipment.service.OneCodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -24,6 +26,17 @@ public class OneCodeController { + /** + * 获取code编码， + * */ + @RequestMapping("/get/getPrints") + public R getPrints(@RequestBody OneCodeReq req) { + + PageUtils pageUtils = oneCodeService.selectByReq(req); + + return R.ok().put("codes", pageUtils); + } + /** * 批量生成指定数量编码， * */ diff --git a/src/main/java/com/lz/modules/equipment/dao/OneCodeMapper.java b/src/main/java/com/lz/modules/equipment/dao/OneCodeMapper.java index 88e26a2f..910d6907 100644 --- a/src/main/java/com/lz/modules/equipment/dao/OneCodeMapper.java +++ b/src/main/java/com/lz/modules/equipment/dao/OneCodeMapper.java @@ -8,7 +8,9 @@ package com.lz.modules.equipment.dao; * @since 2020-07-29 */ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.lz.modules.equipment.entity.OneCode; +import com.lz.modules.equipment.entity.OneCodeReq; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -40,4 +42,6 @@ public interface OneCodeMapper extends BaseMapper { OneCode selectByCode(@Param("code") String code); Long updatePrintOneCodes(List codes); + + List selectByCondition(@Param("page") IPage page, @Param("req") OneCodeReq req); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/equipment/entity/OneCodeReq.java b/src/main/java/com/lz/modules/equipment/entity/OneCodeReq.java new file mode 100644 index 00000000..2d10e6f0 --- /dev/null +++ b/src/main/java/com/lz/modules/equipment/entity/OneCodeReq.java @@ -0,0 +1,33 @@ +package com.lz.modules.equipment.entity; + +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** +*

+* 菜单权限表 +*

*员工表 +* @author quyixiao +* @since 2020-07-30 +*/ + + +@Data +public class OneCodeReq implements java.io.Serializable { + + private int page = 1; + private int rows = 10; + private Long id; + //是否删除0未删除，1删除 + private Integer isDelete; + //创建时间 + private Date gmtCreate; + //修改时间 + private Date gmtModified; + //编码 + private String code; + //是否打印 0未打印 1打印 + private Integer isPrint; +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/equipment/service/OneCodeService.java b/src/main/java/com/lz/modules/equipment/service/OneCodeService.java index 648d280d..a6e43581 100644 --- a/src/main/java/com/lz/modules/equipment/service/OneCodeService.java +++ b/src/main/java/com/lz/modules/equipment/service/OneCodeService.java @@ -2,7 +2,9 @@ package com.lz.modules.equipment.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.common.utils.PageUtils; import com.lz.modules.equipment.entity.OneCode; +import com.lz.modules.equipment.entity.OneCodeReq; import java.util.List; @@ -40,4 +42,6 @@ public interface OneCodeService extends IService { OneCode selectByCode(String code); Long updatePrintOneCodes(List codes); + + PageUtils selectByReq(OneCodeReq req); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/equipment/service/impl/OneCodeServiceImpl.java b/src/main/java/com/lz/modules/equipment/service/impl/OneCodeServiceImpl.java index 6a6ab70a..c2399aba 100644 --- a/src/main/java/com/lz/modules/equipment/service/impl/OneCodeServiceImpl.java +++ b/src/main/java/com/lz/modules/equipment/service/impl/OneCodeServiceImpl.java @@ -1,8 +1,10 @@ package com.lz.modules.equipment.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lz.common.utils.PageUtils; import com.lz.modules.equipment.dao.OneCodeMapper; import com.lz.modules.equipment.entity.OneCode; +import com.lz.modules.equipment.entity.OneCodeReq; import com.lz.modules.equipment.service.OneCodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -80,4 +82,12 @@ public class OneCodeServiceImpl extends ServiceImpl impl return oneCodeMapper.updatePrintOneCodes(codes); } + @Override + public PageUtils selectByReq(OneCodeReq req){ + PageUtils pageUtils = PageUtils.startPage(req.getPage(), req.getRows()).doSelect( + page -> oneCodeMapper.selectByCondition(page, req) + ); + return pageUtils; + } + } diff --git a/src/main/resources/mapper/equipment/OneCodeMapper.xml b/src/main/resources/mapper/equipment/OneCodeMapper.xml index f3ebbea1..dd5568cd 100644 --- a/src/main/resources/mapper/equipment/OneCodeMapper.xml +++ b/src/main/resources/mapper/equipment/OneCodeMapper.xml @@ -114,5 +114,12 @@ ) + +