组词查询开发

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java

@@ -233,4 +233,10 @@ public class DevInfoController extends BaseController {
         HttpServletResponse resp = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
         devInfoService.downLoadTemplate(resp);
     }
+
+    @ApiOperation(value = "搜索组词")
+    @PostMapping("/likeKeyWord")
+    public AjaxResult likeKeyWord( DevInfo devInfo) {
+        return AjaxResult.success(devInfoService.selectLikeKeyWord(devInfo));
+    }
 }

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java

@@ -17,13 +17,13 @@ import java.util.List;
 
 /**
  * 设备信息Mapper接口
- * 
+ *
  * @author syruan
  */
 public interface DevInfoMapper {
     /**
      * 查询设备信息
-     * 
+     *
      * @param maId 设备信息主键
      * @return 设备信息
      */
@@ -61,7 +61,7 @@ public interface DevInfoMapper {
 
     /**
      * 查询设备信息列表
-     * 
+     *
      * @param devInfo 设备信息
      * @return 设备信息集合
      */
@@ -73,7 +73,7 @@ public interface DevInfoMapper {
 
     /**
      * 新增设备信息
-     * 
+     *
      * @param devInfo 设备信息
      * @return 结果
      */
@@ -87,7 +87,7 @@ public interface DevInfoMapper {
 
     /**
      * 修改设备信息
-     * 
+     *
      * @param devInfo 设备信息
      * @return 结果
      */
@@ -95,7 +95,7 @@ public interface DevInfoMapper {
 
     /**
      * 删除设备信息 -- 逻辑删除 -- 限制状态删除
-     * 
+     *
      * @param maId 设备信息主键
      * @param statusCode 状态码
      * @return 结果
@@ -104,7 +104,7 @@ public interface DevInfoMapper {
 
     /**
      * 批量删除设备信息
-     * 
+     *
      * @param maIds 需要删除的数据主键集合
      * @return 结果
      */
@@ -221,5 +221,8 @@ public interface DevInfoMapper {
     List<DevInfo> getLeaseCountByTypeName();
 
     List<DevInfo> getDeviceShareRanking();
+
+    List<DevInfo> selectLikeKeyWord(DevInfo devInfo);
+
 }
 

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java

@@ -15,13 +15,13 @@ import java.util.Map;
 
 /**
  * 设备信息Service接口
- * 
+ *
  * @author syruan
  */
 public interface DevInfoService {
     /**
      * 查询设备信息
-     * 
+     *
      * @param maId 设备信息主键
      * @param isHome 是否是首页进入
      * @return 设备信息
@@ -30,7 +30,7 @@ public interface DevInfoService {
 
     /**
      * 查询装备共享大厅列表
-     * 
+     *
      * @param devInfo 设备信息
      * @return 设备信息集合
      */
@@ -44,7 +44,7 @@ public interface DevInfoService {
 
     /**
      * 修改设备信息
-     * 
+     *
      * @param devInfo 设备信息
      * @return 结果
      */
@@ -52,7 +52,7 @@ public interface DevInfoService {
 
     /**
      * 批量删除设备信息
-     * 
+     *
      * @param maIds 需要删除的设备信息主键集合
      * @return 结果
      */
@@ -60,7 +60,7 @@ public interface DevInfoService {
 
     /**
      * 删除设备信息信息
-     * 
+     *
      * @param maId 设备信息主键
      * @return 结果
      */
@@ -107,4 +107,6 @@ public interface DevInfoService {
     List<DevInfoVo> getTagDevList(DevInfoVo devInfoVo);
 
     List<DevInfoVo> getDevList(DevInfoVo devInfo);
+
+    List<DevInfo>  selectLikeKeyWord(DevInfo devInfo);
 }

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java

@@ -147,9 +147,9 @@ public class DevInfoServiceImpl implements DevInfoService {
             if (StringUtils.isNotBlank(devInfoVo.getCompanyId())) {
                 int devNum = devInfoMapper.selectCompany(devInfoVo.getCompanyId());
                 int companyVisitNum = devInfoMapper.getCompanyUpNum(devInfoVo.getCompanyId());
-                DevInfoVo infoVo = devInfoMapper.selectCompanyById(devInfoVo.getCompanyId());
+             //   DevInfoVo infoVo = devInfoMapper.selectCompanyById(devInfoVo.getCompanyId());
                 devInfoVo.setCompanyVisitNum(companyVisitNum);
-                devInfoVo.setCompanyCreateTime(infoVo.getCompanyCreateTime());
+           //     devInfoVo.setCompanyCreateTime(infoVo.getCompanyCreateTime());
                 devInfoVo.setDevUapNum(devNum);
             }
             //根据设备id及用户id去预约表中查询是否已经加入预约车
@@ -799,6 +799,12 @@ public class DevInfoServiceImpl implements DevInfoService {
         return devList;
     }
 
+    @Override
+    public List<DevInfo> selectLikeKeyWord(DevInfo devInfo) {
+        return devInfoMapper.selectLikeKeyWord(devInfo);
+    }
+
+
     @Override
     public void insertOutType(String devInfo) {
         ObjectMapper objectMapper = new ObjectMapper();

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java

@@ -260,6 +260,7 @@ public class OrderController extends BaseController {
                 if (Objects.isNull(orderDetailDto.getRentBeginTime()) || Objects.isNull(orderDetailDto.getRentEndTime())) {
                     return AjaxResult.error("请先选择租期");
                 }
+
                 Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString());
                 String beginTime = outputFormat.format(rentBeginTime);
                 Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString());
@@ -279,9 +280,14 @@ public class OrderController extends BaseController {
                     XWPFParagraph paragraph = (XWPFParagraph) element;
                     for (XWPFRun run : paragraph.getRuns()) {
                         String text = run.getText(0);
+                        logger.info("text:{}", text);
                         if (text != null) {
                             for (Map.Entry<String, String> entry : replacements.entrySet()) {
-                                text = text.replace(entry.getKey(), entry.getValue());
+                                logger.info("key:{},value:{}", entry.getKey(), entry.getValue());
+                                if (entry.getValue()!=null){
+                                    text = text.replace(entry.getKey(), entry.getValue());
+                                }
+
                             }
                             run.setText(text, 0);
                         }

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml

@@ -1024,4 +1024,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by mdi.own_co
         order by device_count desc
     </select>
+
+    <select id="selectLikeKeyWord" resultType="com.bonus.material.device.domain.DevInfo">
+        select
+            mt.type_id,
+            mt.type_name AS thirdName
+        FROM
+            ma_type mt
+        WHERE mt.del_flag =0 AND mt.`level` = 3
+    </select>
 </mapper>