装备共享大厅联调

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/controller/BookCarController.java

@@ -32,12 +32,7 @@ public class BookCarController extends BaseController {
     @ApiOperation(value = "添加预约车")
     @PostMapping("/addBookCar")
     public AjaxResult addBookCar(@RequestBody BookCarInfoDto bookCarInfoDto) {
-        Integer i = bookCarService.addBookCar(bookCarInfoDto);
+        return bookCarService.addBookCar(bookCarInfoDto);
-        if (i > 0) {
-            return AjaxResult.success("添加成功");
-        } else {
-            return AjaxResult.error("添加失败");
-        }
     }
 
     /**

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/mapper/BookCarMapper.java

@@ -6,7 +6,6 @@ import com.bonus.material.device.domain.vo.DevInfoVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,6 +22,18 @@ public interface BookCarMapper {
      */
     Integer addBookCarDetail(BookCarInfoDto bookCarInfoDto);
 
+    /**
+     * 查询预约车详情
+     * @param devInfo
+     * @return
+     */
     List<DevInfoVo> getBookCarDetails(BookCarInfoDto devInfo);
 
+    /**
+     * 查询设备详情
+     * @param maId
+     * @param userId
+     * @return
+     */
+    DevInfoVo selectDevInfoByMaId(@Param("maId") String maId, @Param("userId") Long userId);
 }

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/BookCarService.java

@@ -17,7 +17,7 @@ public interface BookCarService {
      * @param bookCarInfoDto
      * @return
      */
-    Integer addBookCar(BookCarInfoDto bookCarInfoDto);
+    AjaxResult addBookCar(BookCarInfoDto bookCarInfoDto);
 
     /**
      * 获取预约车详情

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java

@@ -39,11 +39,20 @@ public class BookCarServiceImpl implements BookCarService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Integer addBookCar(BookCarInfoDto bookCarInfoDto) {
+    public AjaxResult addBookCar(BookCarInfoDto bookCarInfoDto) {
-        Long userid = SecurityUtils.getLoginUser().getUserid();
+        Long userId = SecurityUtils.getLoginUser().getUserid();
-        bookCarInfoDto.setCreater(userid.toString());
+        bookCarInfoDto.setCreater(userId.toString());
-        bookCarInfoDto.setOrderUser(userid);
+        bookCarInfoDto.setOrderUser(userId);
-        return bookCarMapper.addBookCarDetail(bookCarInfoDto);
+        //先根据设备id查询设备信息
+        DevInfoVo devInfoVo = bookCarMapper.selectDevInfoByMaId(bookCarInfoDto.getMaId(), userId);
+        if (devInfoVo != null) {
+            return AjaxResult.error("该设备已添加到预约车，请勿重复添加");
+        }
+        Integer result = bookCarMapper.addBookCarDetail(bookCarInfoDto);
+        if (result > 0) {
+            return AjaxResult.success("添加成功");
+        }
+        return AjaxResult.error("添加失败");
     }
 
     @Override

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

@@ -48,8 +48,8 @@ public class DevInfoController extends BaseController {
     @PostMapping("/list")
     public AjaxResult list(@RequestBody DevInfoVo devInfo) {
         List<DevInfoVo> list = devInfoService.selectDevInfoList(devInfo);
-        Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+        Integer pageIndex = Convert.toInt(devInfo.getPageNum(), 1);
-        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+        Integer pageSize = Convert.toInt(devInfo.getPageSize(), 10);
         return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 

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

@@ -100,6 +100,10 @@ public class DevInfoServiceImpl implements DevInfoService {
         return devInfoVo;
     }
 
+    /**
+     * 更新设备搜索量
+     * @param maId
+     */
     private void updateHotSearch(Long maId) {
         int count = devInfoMapper.getHotSearchCountByMaId(maId);
         if (count == 0) {

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                d.code              as code,
                d.device_name       as deviceName,
                d.device_weight     as deviceWeight,
+               d.device_count      as deviceCount,
                d.type_id           as typeId,
                d.ma_status         as maStatus,
                d.brand             as brand,
@@ -38,4 +39,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where d.is_active = '1' and bcd.order_status = '0'
     </select>
 
+    <select id="selectDevInfoByMaId" resultType="com.bonus.material.device.domain.vo.DevInfoVo">
+        SELECT ma_id         as maId,
+               order_user    as orderUser
+        from book_car_detail
+        where ma_id = #{maId} and order_user = #{userId}
+    </select>
+
 </mapper>

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

@@ -117,12 +117,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="areaId != null  and areaId != ''"> and d.area_id = #{areaId}</if>
             <if test="brand != null  and brand != ''"> and d.brand = #{brand}</if>
             <if test="modelName != null  and modelName != ''"> and d.model_name like concat('%', #{modelName}, '%')</if>
-            <if test="ageMin != null  and ageMin != '' and ageMax != null  and ageMax != ''">
+            <if test="ageMin != null and ageMax != null">
-                and DATEDIFF(DATE_FORMAT(now(), '%Y-%m-%d'), d.production_date) &gt;= #{ageMin} * 365
+                and TIMESTAMPDIFF(YEAR, d.production_date, NOW()) &gt;= #{ageMin}
-                and DATEDIFF(DATE_FORMAT(now(), '%Y-%m-%d'), d.production_date) &lt;= #{ageMax} * 365
+                and TIMESTAMPDIFF(YEAR, d.production_date, NOW()) &lt;= #{ageMax}
             </if>
-            <if test="ageMin == null  and ageMin == '' and ageMax != null  and ageMax != ''">
+            <if test="ageMin == null and ageMax != null">
-                and DATEDIFF(DATE_FORMAT(now(), '%Y-%m-%d'), d.production_date) &gt; #{ageMax} * 365
+                and TIMESTAMPDIFF(YEAR, d.production_date, NOW()) &gt;= #{ageMax}
             </if>
             <if test="workingHoursMin != null  and workingHoursMin != '' and workingHoursMax != null  and workingHoursMax != ''">
                 and d.working_hours &gt;= #{workingHoursMin} and d.working_hours &lt;= #{workingHoursMax}
@@ -145,11 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     or locate(#{keyWord},mt2.type_name) > 0
                     or locate(#{keyWord},mt3.type_name) > 0
                     or locate(#{keyWord},c.company_name) > 0
-                    or locate(#{keyWord},d.ma_id) > 0
+                    or locate(#{keyWord},d.device_name) > 0
-                    or locate(#{keyWord},d.model_name) > 0
-                    or locate(#{keyWord},d.specification) > 0
-                    or locate(#{keyWord},d.serial_number) > 0
-                    or locate(#{keyWord},d.description) > 0
                 )
             </if>
            and  d.is_active='1'
@@ -163,10 +159,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ,d.day_lease_price DESC
             </if>
             <if test="updateTimeOrderBy != null  and updateTimeOrderBy == 'ASC'">
-                ,d.update_time
+                ,d.create_time
             </if>
             <if test="updateTimeOrderBy != null  and updateTimeOrderBy == 'DESC'">
-                ,d.update_time DESC
+                ,d.create_time DESC
             </if>
     </select>
 

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml

@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getMaTypeInfoList" resultType="com.bonus.common.biz.domain.TreeNode">
         select type_id as id, parent_id as parentId, type_name as name, `level` as level, manage_type as manageType,
-               unit_name as unitName, del_flag as delFlag
+               unit_name as unitName
         from ma_type
         where del_flag = '0'
     </select>