From 4f302cef201f0783f94ea0231397c611d4bfcaa9 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 10 Apr 2025 17:44:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=AE=BE=E5=A4=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/basic/controller/DevController.java | 59 ++++++++- .../base/basic/controller/UnitController.java | 9 +- .../bonus/base/basic/domain/vo/DeviceVo.java | 114 ++++++++++++++++ .../base/basic/domain/{ => vo}/UnitVo.java | 7 +- .../bonus/base/basic/mapper/IDevMapper.java | 62 +++++++++ .../bonus/base/basic/mapper/IUnitMapper.java | 2 +- .../bonus/base/basic/service/IDevService.java | 49 +++++++ .../base/basic/service/IUnitService.java | 2 +- .../basic/service/impl/DevServiceImpl.java | 124 ++++++++++++++++++ .../basic/service/impl/UnitServiceImpl.java | 2 +- .../mapper/smartsite/basic/DevMapper.xml | 118 +++++++++++++++++ .../mapper/smartsite/basic/UnitMapper.xml | 13 +- 12 files changed, 549 insertions(+), 12 deletions(-) create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/DeviceVo.java rename bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/{ => vo}/UnitVo.java (93%) create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IDevMapper.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IDevService.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/DevServiceImpl.java create mode 100644 bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DevController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DevController.java index 264a781..24a72c3 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DevController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DevController.java @@ -1,7 +1,64 @@ package com.bonus.base.basic.controller; +import com.bonus.base.basic.domain.vo.DeviceVo; +import com.bonus.base.basic.service.IDevService; +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + /** * @author 黑子 */ -public class DevController { +@Api(tags = "设备管理") +@RestController +@RequestMapping("/dev/") +public class DevController extends BaseController { + + @Resource(name = "IDevService") + private IDevService service; + + @ApiOperation(value = "查询设备数据") +// @RequiresPermissions("basic:dev:list") + @SysLog(title = "设备管理", businessType = OperaType.QUERY, logType = 1,module = "设备管理->查询设备数据") + @GetMapping("queryDevList") + public TableDataInfo queryDevList(DeviceVo vo) { + startPage(); + List list = service.queryDevList(vo); + return getDataTable(list); + } + + @ApiOperation(value = "新增设备") +// @PreventRepeatSubmit +// @RequiresPermissions("basic:dev:add") + @SysLog(title = "设备管理", businessType = OperaType.INSERT, logType = 1,module = "设备管理->新增设备") + @PostMapping("addDev") + public AjaxResult addDev(@RequestBody DeviceVo vo) { + return service.addDev(vo); + } + + @ApiOperation(value = "修改设备") +// @PreventRepeatSubmit +// @RequiresPermissions("basic:dev:edit") + @SysLog(title = "设备管理", businessType = OperaType.UPDATE, logType = 1,module = "设备管理->修改设备") + @PostMapping("editDev") + public AjaxResult editDev(@RequestBody DeviceVo vo) { + return service.editDev(vo); + } + + @ApiOperation(value = "删除设备") +// @PreventRepeatSubmit +// @RequiresPermissions("basic:dev:del") + @SysLog(title = "设备管理", businessType = OperaType.UPDATE, logType = 1,module = "设备管理->删除设备") + @PostMapping("delDev") + public AjaxResult delDev(@RequestBody DeviceVo vo) { + return service.delDev(vo); + } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/UnitController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/UnitController.java index 012980c..9e05f99 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/UnitController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/UnitController.java @@ -1,15 +1,12 @@ package com.bonus.base.basic.controller; -import com.bonus.base.basic.domain.BmProject; -import com.bonus.base.basic.domain.UnitVo; +import com.bonus.base.basic.domain.vo.UnitVo; import com.bonus.base.basic.service.IUnitService; -import com.bonus.base.common.annotation.PreventRepeatSubmit; 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 com.bonus.common.security.annotation.RequiresPermissions; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -26,7 +23,7 @@ import java.util.List; */ @Api(tags = "单位管理") @RestController -@RequestMapping("/unit") +@RequestMapping("/unit/") public class UnitController extends BaseController { @Resource(name = "IUnitService") @@ -35,7 +32,7 @@ public class UnitController extends BaseController { @ApiOperation(value = "查询单位数据") // @RequiresPermissions("basic:unit:list") @SysLog(title = "单位管理", businessType = OperaType.QUERY, logType = 1,module = "单位管理->查询单位数据") - @GetMapping("/queryUnitList") + @GetMapping("queryUnitList") public TableDataInfo queryUnitList(UnitVo vo) { startPage(); List list = service.queryUnitList(vo); diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/DeviceVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/DeviceVo.java new file mode 100644 index 0000000..fe9a603 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/DeviceVo.java @@ -0,0 +1,114 @@ +package com.bonus.base.basic.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.util.Date; + +/** + * @className:DeviceVo + * @author:cwchen + * @date:2025-04-10-15:14 + * @version:1.0 + * @description:设备-vo + */ +@Data +public class DeviceVo { + + /** + * 关键字 + */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String keyWord; + + @NotBlank(message = "id不能为空", groups = {Edit.class, Del.class}) + private String id; + /** + * 设备名称 + */ + @NotBlank(message = "设备名称不能为空", groups = {Add.class, Edit.class}) + @Length(max = 255, message = "设备名称字符长度不能超过255", groups = {Add.class, Edit.class}) + private String devName; + /** + * 设备编码 + */ + @NotBlank(message = "设备编码不能为空", groups = {Add.class, Edit.class}) + @Length(max = 64, message = "设备编码字符长度不能超过64", groups = {Add.class, Edit.class}) + private String macId; + /** + * 设备类型编码 + */ + @NotBlank(message = "设备类型编码不能为空", groups = {Add.class, Edit.class}) + private String devTypeCode; + /** + * 设备类型名称 + */ + @NotBlank(message = "设备类型名称不能为空", groups = {Add.class, Edit.class}) + private String devTypeName; + /** + * puid （固定式球机允许有多个） + */ + @NotBlank(message = "puid不能为空", groups = {Add.class, Edit.class}) + @Length(max = 64, message = "puid字符长度不能超过64", groups = {Add.class, Edit.class}) + private String puid; + /** + * 国标编码 + */ + @Length(max = 64, message = "国标编码字符长度不能超过64", groups = {Add.class, Edit.class}) + private String gbCode; + /** + * 设备播放下标默认为0,多个为1,2,3..... + */ + @Min(value = 0, message = "设备播放下标不能小于0", groups = {Add.class, Edit.class}) + @Max(value = 11, message = "设备播放下标不能大于11", groups = {Add.class, Edit.class}) + private int playIdx; + /** + * 在线状态 0.不在线 1.在线 + */ + private String onlineStatus; + /** + * 在线状态名称 + */ + private String onlineStatusName; + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + /** + * 修改时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date updateTime; + /** + * 备注 + */ + @Length(max = 255, message = "备注字符长度不能超过255", groups = {Add.class, Edit.class}) + private String remark; + + /** + * 新增条件限制 + */ + public interface Add { + } + + /** + * 修改条件限制 + */ + public interface Edit { + } + + /** + * 删除条件限制 + */ + public interface Del { + } +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/UnitVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/UnitVo.java similarity index 93% rename from bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/UnitVo.java rename to bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/UnitVo.java index 87e53e1..1b4fe23 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/UnitVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/UnitVo.java @@ -1,5 +1,6 @@ -package com.bonus.base.basic.domain; +package com.bonus.base.basic.domain.vo; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -17,6 +18,10 @@ import javax.validation.constraints.Pattern; @Data public class UnitVo { + /**关键字*/ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String keyWord; + @NotBlank(message = "id不能为空", groups = {Edit.class,Del.class}) private String id; /** diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IDevMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IDevMapper.java new file mode 100644 index 0000000..026680d --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IDevMapper.java @@ -0,0 +1,62 @@ +package com.bonus.base.basic.mapper; + +import com.bonus.base.basic.domain.vo.DeviceVo; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @className:IDevMapper + * @author:cwchen + * @date:2025-04-10-14:28 + * @version:1.0 + * @description:设备管理-数据层 + */ +@Repository(value = "IDevMapper") +public interface IDevMapper { + /** + * 查询设备数据 + * + * @param vo + * @return List + * @author cwchen + * @date 2025/4/10 15:24 + */ + List queryDevList(DeviceVo vo); + + /** + * 查询数据是否重复 + * + * @param vo + * @param value + * @param columnName + * @return int + * @author cwchen + * @date 2025/4/10 16:12 + */ + int queryValueIsExist(@Param("params") DeviceVo vo, @Param("value") String value, @Param("columnName") String columnName); + + /** + * 1.新增/2.修改/3.删除设备 + * + * @param vo + * @param type + * @return void + * @author cwchen + * @date 2025/4/10 16:14 + */ + void addOrUpdateDevice(@Param("params") DeviceVo vo, @Param("type") int type); + + /** + * 查询数据是否重复-共用同一个puid的视频设备 + * + * @param vo + * @param value + * @param columnName + * @return int + * @author cwchen + * @date 2025/4/10 16:12 + */ + int queryValueIsExist2(@Param("params") DeviceVo vo, @Param("value") String value, @Param("columnName") String columnName); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IUnitMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IUnitMapper.java index 6b3ea5d..28d567e 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IUnitMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/IUnitMapper.java @@ -1,6 +1,6 @@ package com.bonus.base.basic.mapper; -import com.bonus.base.basic.domain.UnitVo; +import com.bonus.base.basic.domain.vo.UnitVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IDevService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IDevService.java new file mode 100644 index 0000000..3cbc815 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IDevService.java @@ -0,0 +1,49 @@ +package com.bonus.base.basic.service; + +import com.bonus.base.basic.domain.vo.DeviceVo; +import com.bonus.common.core.web.domain.AjaxResult; + +import java.util.List; + +/** + * @className:IDevService + * @author:cwchen + * @date:2025-04-10-14:26 + * @version:1.0 + * @description:设备管理-业务层 + */ +public interface IDevService { + /** + * 查询设备数据 + * @param vo + * @return List + * @author cwchen + * @date 2025/4/10 15:14 + */ + List queryDevList(DeviceVo vo); + + /** + * 新增设备 + * @param vo + * @return AjaxResult + * @author cwchen + * @date 2025/4/10 15:54 + */ + AjaxResult addDev(DeviceVo vo); + /** + * 修改设备 + * @param vo + * @return AjaxResult + * @author cwchen + * @date 2025/4/10 15:54 + */ + AjaxResult editDev(DeviceVo vo); + /** + * 删除设备 + * @param vo + * @return AjaxResult + * @author cwchen + * @date 2025/4/10 15:54 + */ + AjaxResult delDev(DeviceVo vo); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IUnitService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IUnitService.java index 5cb6ef4..f6f34c0 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IUnitService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IUnitService.java @@ -1,6 +1,6 @@ package com.bonus.base.basic.service; -import com.bonus.base.basic.domain.UnitVo; +import com.bonus.base.basic.domain.vo.UnitVo; import com.bonus.common.core.web.domain.AjaxResult; import java.util.List; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/DevServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/DevServiceImpl.java new file mode 100644 index 0000000..efbc807 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/DevServiceImpl.java @@ -0,0 +1,124 @@ +package com.bonus.base.basic.service.impl; + +import com.bonus.base.basic.domain.vo.DeviceVo; +import com.bonus.base.basic.mapper.IDevMapper; +import com.bonus.base.basic.service.IDevService; +import com.bonus.common.core.utils.uuid.IdUtils; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.security.utils.ValidatorsUtils; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +/** + * @className:DevServiceImpl + * @author:cwchen + * @date:2025-04-10-14:27 + * @version:1.0 + * @description:设备管理-业务逻辑层 + */ +@Service(value = "IDevService") +@Slf4j +public class DevServiceImpl implements IDevService { + + @Resource(name = "IDevMapper") + private IDevMapper mapper; + + @Resource(name = "ValidatorsUtils") + private ValidatorsUtils validatorsUtils; + + @Override + public List queryDevList(DeviceVo vo) { + try { + List list = Optional.ofNullable(mapper.queryDevList(vo)).orElseGet(ArrayList::new); + return list; + } catch (Exception e) { + log.error(e.toString(), e); + return new ArrayList(); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult addDev(DeviceVo vo) { + try { + // 校验必填数据 + String validResult = validatorsUtils.valid(vo, DeviceVo.Add.class); + if (StringUtils.isNotBlank(validResult)) { + return AjaxResult.error(validResult); + } + // 校验设备编码是否重复 + int flag = mapper.queryValueIsExist(vo,vo.getMacId(),"mac_id"); + if (flag > 0) return AjaxResult.error("设备编码已存在"); + // 校验puid是否重复 + if(vo.getDevTypeCode().contains("_1")){ // 可配置多个相同puid + int flag2 = mapper.queryValueIsExist2(vo,vo.getPuid(),"puid"); + if (flag2 > 0) return AjaxResult.error("puid已存在或puid和播放索引已存在"); + }else{ // 只可配置一个puid + int flag2 = mapper.queryValueIsExist(vo,vo.getPuid(),"puid"); + if (flag2 > 0) return AjaxResult.error("puid已存在"); + } + vo.setId(IdUtils.simpleUUID()); + mapper.addOrUpdateDevice(vo,1); + return AjaxResult.success(); + } catch (Exception e) { + log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult editDev(DeviceVo vo) { + try { + // 校验必填数据 + String validResult = validatorsUtils.valid(vo, DeviceVo.Edit.class); + if (StringUtils.isNotBlank(validResult)) { + return AjaxResult.error(validResult); + } + // 校验设备编码是否重复 + int flag = mapper.queryValueIsExist(vo,vo.getMacId(),"mac_id"); + if (flag > 0) return AjaxResult.error("设备编码已存在"); + // 校验puid是否重复 + if(vo.getDevTypeCode().contains("_1")){ // 可配置多个相同puid + int flag2 = mapper.queryValueIsExist2(vo,vo.getPuid(),"puid"); + if (flag2 > 0) return AjaxResult.error("puid已存在或puid和播放索引已存在"); + }else{ // 只可配置一个puid + int flag2 = mapper.queryValueIsExist(vo,vo.getPuid(),"puid"); + if (flag2 > 0) return AjaxResult.error("puid已存在"); + } + mapper.addOrUpdateDevice(vo,2); + return AjaxResult.success(); + } catch (Exception e) { + log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult delDev(DeviceVo vo) { + try { + // 校验必填数据 + String validResult = validatorsUtils.valid(vo, DeviceVo.Del.class); + if (StringUtils.isNotBlank(validResult)) { + return AjaxResult.error(validResult); + } + mapper.addOrUpdateDevice(vo,3); + return AjaxResult.success(); + } catch (Exception e) { + log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + } +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/UnitServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/UnitServiceImpl.java index 459356a..e0357b6 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/UnitServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/UnitServiceImpl.java @@ -1,6 +1,6 @@ package com.bonus.base.basic.service.impl; -import com.bonus.base.basic.domain.UnitVo; +import com.bonus.base.basic.domain.vo.UnitVo; import com.bonus.base.basic.mapper.IUnitMapper; import com.bonus.base.basic.service.IUnitService; import com.bonus.common.core.utils.uuid.IdUtils; diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml new file mode 100644 index 0000000..cc226d4 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml @@ -0,0 +1,118 @@ + + + + + + + INSERT INTO tt_device + + id, + dev_name, + mac_id, + dev_type_code, + dev_type_name, + puid, + gb_code, + play_idx, + remark, + + + #{params.id}, + #{params.devName}, + #{params.macId}, + #{params.devTypeCode}, + #{params.devTypeName}, + #{params.puid}, + #{params.gbCode}, + #{params.playIdx}, + #{params.remark}, + + + + UPDATE tt_device + + dev_name = #{params.devName}, + mac_id = #{params.macId}, + dev_type_code = #{params.devTypeCode}, + dev_type_name = #{params.devTypeName}, + puid =#{params.puid}, + gb_code = #{params.gbCode}, + play_idx = #{params.playIdx}, + remark = #{params.remark} + + WHERE id = #{params.id} + + + UPDATE tt_device SET is_active = '0' WHERE id = #{params.id} + + + + + + + + + + \ No newline at end of file diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/UnitMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/UnitMapper.xml index e45887c..4f6c61d 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/UnitMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/UnitMapper.xml @@ -3,6 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + INSERT INTO tt_sys_unit @@ -58,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT id, unit_name AS unitName, unit_type AS unitType, @@ -73,6 +74,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" register AS register FROM tt_sys_unit + + AND ( + INSTR(unit_name,#{keyWord}) > 0 OR + INSTR(unit_code,#{keyWord}) > 0 OR + INSTR(unit_user,#{keyWord}) > 0 OR + INSTR(unit_phone,#{keyWord}) > 0 OR + INSTR(suff_user,#{keyWord}) > 0 OR + INSTR(suff_phone,#{keyWord}) > 0 + ) + AND is_active = '1'