日志模块以及修改了一些其他的功能模块
This commit is contained in:
parent
b97be72c54
commit
3ef744a46f
@ -1,19 +1,26 @@
|
|||||||
package com.ruoyi.project.hit.controller;
|
package com.ruoyi.project.hit.controller;
|
||||||
|
|
||||||
|
import com.ruoyi.framework.web.controller.BaseController;
|
||||||
import com.ruoyi.framework.web.domain.AjaxResult;
|
import com.ruoyi.framework.web.domain.AjaxResult;
|
||||||
|
import com.ruoyi.project.hit.domain.PupuEquipment;
|
||||||
import com.ruoyi.project.hit.service.PupuEquipmentService;
|
import com.ruoyi.project.hit.service.PupuEquipmentService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/hit/equipment")
|
@RequestMapping("/hit/equipment")
|
||||||
public class PupuEquipmentController {
|
public class PupuEquipmentController extends BaseController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private PupuEquipmentService pupuEquipmentService;
|
private PupuEquipmentService pupuEquipmentService;
|
||||||
|
|
||||||
// @PutMapping("/add")
|
@PutMapping("/add")
|
||||||
// public AjaxResult add(@RequestBody )
|
public AjaxResult add(@RequestBody PupuEquipment pupuEquipment){
|
||||||
|
return toAjax(pupuEquipmentService.add(pupuEquipment));
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/del/{equipmentId}")
|
||||||
|
public AjaxResult del(@PathVariable(value = "equipmentId") Integer equipmentId){
|
||||||
|
return toAjax(pupuEquipmentService.del(equipmentId));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,32 @@
|
|||||||
|
package com.ruoyi.project.hit.controller;
|
||||||
|
|
||||||
|
import com.ruoyi.framework.web.controller.BaseController;
|
||||||
|
import com.ruoyi.framework.web.page.TableDataInfo;
|
||||||
|
import com.ruoyi.project.hit.domain.vo.SelectLogVO;
|
||||||
|
import com.ruoyi.project.hit.service.PupuLogService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/hit/log")
|
||||||
|
public class PupuLogController extends BaseController {
|
||||||
|
@Autowired
|
||||||
|
private PupuLogService pupuLogService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 日志查询(分页)
|
||||||
|
* @param selectLogVO
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/select")
|
||||||
|
public TableDataInfo select(@RequestBody SelectLogVO selectLogVO){
|
||||||
|
List<HashMap> select = pupuLogService.select(selectLogVO);
|
||||||
|
return getDataTable(select);
|
||||||
|
}
|
||||||
|
}
|
@ -1,9 +1,7 @@
|
|||||||
package com.ruoyi.project.hit.domain;
|
package com.ruoyi.project.hit.domain;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -14,12 +12,16 @@ import lombok.Data;
|
|||||||
@TableName(value ="pupu_equipment")
|
@TableName(value ="pupu_equipment")
|
||||||
@Data
|
@Data
|
||||||
public class PupuEquipment implements Serializable {
|
public class PupuEquipment implements Serializable {
|
||||||
|
@TableId(type = IdType.AUTO)
|
||||||
private Integer equipmentId;
|
private Integer equipmentId;
|
||||||
|
|
||||||
private String serialNumber;
|
private String serialNumber;
|
||||||
|
|
||||||
|
@TableField(fill = FieldFill.INSERT)
|
||||||
private Date createTime;
|
private Date createTime;
|
||||||
|
|
||||||
|
private Integer storeId;
|
||||||
|
|
||||||
private Integer status;
|
private Integer status;
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
32
src/main/java/com/ruoyi/project/hit/domain/PupuLog.java
Normal file
32
src/main/java/com/ruoyi/project/hit/domain/PupuLog.java
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
package com.ruoyi.project.hit.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.Date;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @TableName pupu_log
|
||||||
|
*/
|
||||||
|
@TableName(value ="pupu_log")
|
||||||
|
@Data
|
||||||
|
public class PupuLog implements Serializable {
|
||||||
|
@TableId(type = IdType.AUTO)
|
||||||
|
private Integer logId;
|
||||||
|
|
||||||
|
private String logEvent;
|
||||||
|
|
||||||
|
private Integer logSort;
|
||||||
|
|
||||||
|
@TableField(fill = FieldFill.INSERT)
|
||||||
|
private Date time;
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
public PupuLog(String logEvent, Integer logSort, Date time) {
|
||||||
|
this.logEvent = logEvent;
|
||||||
|
this.logSort = logSort;
|
||||||
|
this.time = time;
|
||||||
|
}
|
||||||
|
}
|
@ -1,23 +0,0 @@
|
|||||||
package com.ruoyi.project.hit.domain;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import java.io.Serializable;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @TableName pupu_store_equipment
|
|
||||||
*/
|
|
||||||
@TableName(value ="pupu_store_equipment")
|
|
||||||
@Data
|
|
||||||
public class PupuStoreEquipment implements Serializable {
|
|
||||||
private Integer id;
|
|
||||||
|
|
||||||
private Integer storeId;
|
|
||||||
|
|
||||||
private Integer equipmentId;
|
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
}
|
|
@ -1,7 +0,0 @@
|
|||||||
package com.ruoyi.project.hit.domain.vo;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class AddEquipmentVO {
|
|
||||||
}
|
|
@ -0,0 +1,15 @@
|
|||||||
|
package com.ruoyi.project.hit.domain.vo;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class SelectLogVO {
|
||||||
|
|
||||||
|
private Integer sortId;
|
||||||
|
|
||||||
|
private Date startTime;
|
||||||
|
|
||||||
|
private Date endTime;
|
||||||
|
}
|
@ -0,0 +1,23 @@
|
|||||||
|
package com.ruoyi.project.hit.mapper;
|
||||||
|
|
||||||
|
import com.ruoyi.project.hit.domain.PupuLog;
|
||||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
import com.ruoyi.project.hit.domain.vo.SelectLogVO;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author HP
|
||||||
|
* @description 针对表【pupu_log】的数据库操作Mapper
|
||||||
|
* @createDate 2024-09-06 09:11:59
|
||||||
|
* @Entity com.ruoyi.project.hit.domain.PupuLog
|
||||||
|
*/
|
||||||
|
public interface PupuLogMapper extends BaseMapper<PupuLog> {
|
||||||
|
|
||||||
|
List<HashMap> select(SelectLogVO selectLogVO);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
|||||||
package com.ruoyi.project.hit.mapper;
|
|
||||||
|
|
||||||
import com.ruoyi.project.hit.domain.PupuStoreEquipment;
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author HP
|
|
||||||
* @description 针对表【pupu_store_equipment】的数据库操作Mapper
|
|
||||||
* @createDate 2024-09-05 16:50:00
|
|
||||||
* @Entity com.ruoyi.project.hit.domain.PupuStoreEquipment
|
|
||||||
*/
|
|
||||||
public interface PupuStoreEquipmentMapper extends BaseMapper<PupuStoreEquipment> {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -10,4 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||||||
*/
|
*/
|
||||||
public interface PupuEquipmentService extends IService<PupuEquipment> {
|
public interface PupuEquipmentService extends IService<PupuEquipment> {
|
||||||
|
|
||||||
|
int add(PupuEquipment pupuEquipment);
|
||||||
|
|
||||||
|
int del(Integer equipmentId);
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,20 @@
|
|||||||
|
package com.ruoyi.project.hit.service;
|
||||||
|
|
||||||
|
import com.ruoyi.project.hit.domain.PupuLog;
|
||||||
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
import com.ruoyi.project.hit.domain.vo.SelectLogVO;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author HP
|
||||||
|
* @description 针对表【pupu_log】的数据库操作Service
|
||||||
|
* @createDate 2024-09-06 09:11:59
|
||||||
|
*/
|
||||||
|
public interface PupuLogService extends IService<PupuLog> {
|
||||||
|
|
||||||
|
int add(PupuLog pupuLog);
|
||||||
|
|
||||||
|
List<HashMap> select(SelectLogVO selectLogVO);
|
||||||
|
}
|
@ -1,13 +0,0 @@
|
|||||||
package com.ruoyi.project.hit.service;
|
|
||||||
|
|
||||||
import com.ruoyi.project.hit.domain.PupuStoreEquipment;
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author HP
|
|
||||||
* @description 针对表【pupu_store_equipment】的数据库操作Service
|
|
||||||
* @createDate 2024-09-05 16:50:00
|
|
||||||
*/
|
|
||||||
public interface PupuStoreEquipmentService extends IService<PupuStoreEquipment> {
|
|
||||||
|
|
||||||
}
|
|
@ -1,20 +1,59 @@
|
|||||||
package com.ruoyi.project.hit.service.impl;
|
package com.ruoyi.project.hit.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import com.ruoyi.common.exception.CustomException;
|
||||||
import com.ruoyi.project.hit.domain.PupuEquipment;
|
import com.ruoyi.project.hit.domain.PupuEquipment;
|
||||||
|
import com.ruoyi.project.hit.domain.PupuLog;
|
||||||
|
import com.ruoyi.project.hit.domain.PupuStore;
|
||||||
|
import com.ruoyi.project.hit.mapper.PupuStoreMapper;
|
||||||
import com.ruoyi.project.hit.service.PupuEquipmentService;
|
import com.ruoyi.project.hit.service.PupuEquipmentService;
|
||||||
import com.ruoyi.project.hit.mapper.PupuEquipmentMapper;
|
import com.ruoyi.project.hit.mapper.PupuEquipmentMapper;
|
||||||
|
import com.ruoyi.project.hit.service.PupuLogService;
|
||||||
|
import com.ruoyi.project.hit.service.PupuStoreService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author HP
|
* @author HP
|
||||||
* @description 针对表【pupu_equipment】的数据库操作Service实现
|
* @description 针对表【pupu_equipment】的数据库操作Service实现
|
||||||
* @createDate 2024-09-05 16:50:18
|
* @createDate 2024-09-05 16:50:18
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class PupuEquipmentServiceImpl extends ServiceImpl<PupuEquipmentMapper, PupuEquipment>
|
public class PupuEquipmentServiceImpl extends ServiceImpl<PupuEquipmentMapper, PupuEquipment>
|
||||||
implements PupuEquipmentService{
|
implements PupuEquipmentService {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private PupuEquipmentMapper pupuEquipmentMapper;
|
||||||
|
@Resource
|
||||||
|
private PupuLogService pupuLogService;
|
||||||
|
@Resource
|
||||||
|
private PupuStoreMapper pupuStoreMapper;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int add(PupuEquipment pupuEquipment) {
|
||||||
|
if(pupuStoreMapper.selectById(pupuEquipment.getStoreId())==null){
|
||||||
|
throw new CustomException("该门店不存在");
|
||||||
|
}
|
||||||
|
LambdaQueryWrapper<PupuEquipment> wrapper=new LambdaQueryWrapper<>();
|
||||||
|
wrapper.eq(PupuEquipment::getSerialNumber,pupuEquipment.getSerialNumber());
|
||||||
|
if(pupuEquipmentMapper.selectOne(wrapper)!=null){
|
||||||
|
throw new CustomException("标识码重复");
|
||||||
|
};
|
||||||
|
pupuLogService.add(new PupuLog("设备新增",1,new Date()));
|
||||||
|
return pupuEquipmentMapper.insert(pupuEquipment);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int del(Integer equipmentId) {
|
||||||
|
if(pupuEquipmentMapper.selectById(equipmentId)==null){
|
||||||
|
throw new CustomException("该设备不存在");
|
||||||
|
}
|
||||||
|
pupuLogService.add(new PupuLog("设备删除",2,new Date()));
|
||||||
|
return pupuEquipmentMapper.deleteById(equipmentId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -0,0 +1,38 @@
|
|||||||
|
package com.ruoyi.project.hit.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import com.ruoyi.project.hit.domain.PupuLog;
|
||||||
|
import com.ruoyi.project.hit.domain.vo.SelectLogVO;
|
||||||
|
import com.ruoyi.project.hit.service.PupuLogService;
|
||||||
|
import com.ruoyi.project.hit.mapper.PupuLogMapper;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author HP
|
||||||
|
* @description 针对表【pupu_log】的数据库操作Service实现
|
||||||
|
* @createDate 2024-09-06 09:11:59
|
||||||
|
*/
|
||||||
|
@Service
|
||||||
|
public class PupuLogServiceImpl extends ServiceImpl<PupuLogMapper, PupuLog>
|
||||||
|
implements PupuLogService{
|
||||||
|
@Resource
|
||||||
|
private PupuLogMapper pupuLogMapper;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int add(PupuLog pupuLog) {
|
||||||
|
return pupuLogMapper.insert(pupuLog);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<HashMap> select(SelectLogVO selectLogVO) {
|
||||||
|
return pupuLogMapper.select(selectLogVO);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
|||||||
package com.ruoyi.project.hit.service.impl;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
||||||
import com.ruoyi.project.hit.domain.PupuStoreEquipment;
|
|
||||||
import com.ruoyi.project.hit.service.PupuStoreEquipmentService;
|
|
||||||
import com.ruoyi.project.hit.mapper.PupuStoreEquipmentMapper;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author HP
|
|
||||||
* @description 针对表【pupu_store_equipment】的数据库操作Service实现
|
|
||||||
* @createDate 2024-09-05 16:50:00
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
public class PupuStoreEquipmentServiceImpl extends ServiceImpl<PupuStoreEquipmentMapper, PupuStoreEquipment>
|
|
||||||
implements PupuStoreEquipmentService{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,12 +1,15 @@
|
|||||||
package com.ruoyi.project.hit.service.impl;
|
package com.ruoyi.project.hit.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import com.ruoyi.project.hit.domain.PupuLog;
|
||||||
import com.ruoyi.project.hit.domain.PupuStore;
|
import com.ruoyi.project.hit.domain.PupuStore;
|
||||||
|
import com.ruoyi.project.hit.service.PupuLogService;
|
||||||
import com.ruoyi.project.hit.service.PupuStoreService;
|
import com.ruoyi.project.hit.service.PupuStoreService;
|
||||||
import com.ruoyi.project.hit.mapper.PupuStoreMapper;
|
import com.ruoyi.project.hit.mapper.PupuStoreMapper;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author HP
|
* @author HP
|
||||||
@ -19,13 +22,18 @@ public class PupuStoreServiceImpl extends ServiceImpl<PupuStoreMapper, PupuStore
|
|||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private PupuStoreMapper pupuStoreMapper;
|
private PupuStoreMapper pupuStoreMapper;
|
||||||
|
@Resource
|
||||||
|
private PupuLogService pupuLogService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int add(PupuStore pupuStore) {
|
public int add(PupuStore pupuStore) {
|
||||||
|
pupuLogService.add(new PupuLog("门店新增",1,new Date()));
|
||||||
return pupuStoreMapper.insert(pupuStore);
|
return pupuStoreMapper.insert(pupuStore);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int del(Integer storeId) {
|
public int del(Integer storeId) {
|
||||||
|
pupuLogService.add(new PupuLog("门店删除",2,new Date()));
|
||||||
return pupuStoreMapper.deleteById(storeId);
|
return pupuStoreMapper.deleteById(storeId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
<id property="equipmentId" column="equipment_id" jdbcType="INTEGER"/>
|
<id property="equipmentId" column="equipment_id" jdbcType="INTEGER"/>
|
||||||
<result property="serialNumber" column="serial_number" jdbcType="VARCHAR"/>
|
<result property="serialNumber" column="serial_number" jdbcType="VARCHAR"/>
|
||||||
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
||||||
|
<result property="storeId" column="store_id" jdbcType="INTEGER"/>
|
||||||
<result property="status" column="status" jdbcType="INTEGER"/>
|
<result property="status" column="status" jdbcType="INTEGER"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
|
42
src/main/resources/mybatis/hit/PupuLogMapper.xml
Normal file
42
src/main/resources/mybatis/hit/PupuLogMapper.xml
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE mapper
|
||||||
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
<mapper namespace="com.ruoyi.project.hit.mapper.PupuLogMapper">
|
||||||
|
|
||||||
|
<resultMap id="BaseResultMap" type="com.ruoyi.project.hit.domain.PupuLog">
|
||||||
|
<id property="logId" column="log_id" jdbcType="INTEGER"/>
|
||||||
|
<result property="logEvent" column="log_event" jdbcType="VARCHAR"/>
|
||||||
|
<result property="logSort" column="log_sort" jdbcType="INTEGER"/>
|
||||||
|
<result property="time" column="time" jdbcType="TIMESTAMP"/>
|
||||||
|
</resultMap>
|
||||||
|
|
||||||
|
<sql id="Base_Column_List">
|
||||||
|
log_id,log_event,log_sort,
|
||||||
|
time
|
||||||
|
</sql>
|
||||||
|
<select id="select" resultType="java.util.HashMap">
|
||||||
|
SELECT
|
||||||
|
pupu_log.log_id AS logId,
|
||||||
|
pupu_log.log_event AS logEvent,
|
||||||
|
pupu_log.time,
|
||||||
|
pupu_log_sort.sort_name AS sortName
|
||||||
|
FROM
|
||||||
|
pupu_log_sort
|
||||||
|
INNER JOIN
|
||||||
|
pupu_log
|
||||||
|
ON
|
||||||
|
pupu_log_sort.sort_id = pupu_log.log_sort
|
||||||
|
<where>
|
||||||
|
<if test="sortId!=null">
|
||||||
|
pupu_log.log_sort = #{sortId}
|
||||||
|
</if>
|
||||||
|
<if test="startTime !=null" >
|
||||||
|
and pupu_log.time > #{startTime}
|
||||||
|
</if>
|
||||||
|
<if test="endTime !=null" >
|
||||||
|
and pupu_log.time < #{endTime}
|
||||||
|
</if>
|
||||||
|
</where>
|
||||||
|
</select>
|
||||||
|
</mapper>
|
@ -1,16 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE mapper
|
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
|
||||||
<mapper namespace="com.ruoyi.project.hit.mapper.PupuStoreEquipmentMapper">
|
|
||||||
|
|
||||||
<resultMap id="BaseResultMap" type="com.ruoyi.project.hit.domain.PupuStoreEquipment">
|
|
||||||
<id property="id" column="id" jdbcType="INTEGER"/>
|
|
||||||
<result property="storeId" column="store_id" jdbcType="INTEGER"/>
|
|
||||||
<result property="equipmentId" column="equipment_id" jdbcType="INTEGER"/>
|
|
||||||
</resultMap>
|
|
||||||
|
|
||||||
<sql id="Base_Column_List">
|
|
||||||
id,store_id,equipment_id
|
|
||||||
</sql>
|
|
||||||
</mapper>
|
|
@ -8,7 +8,7 @@
|
|||||||
<id property="storeId" column="store_id" jdbcType="INTEGER"/>
|
<id property="storeId" column="store_id" jdbcType="INTEGER"/>
|
||||||
<result property="storeName" column="store_name" jdbcType="VARCHAR"/>
|
<result property="storeName" column="store_name" jdbcType="VARCHAR"/>
|
||||||
<result property="longitude" column="longitude" jdbcType="VARCHAR"/>
|
<result property="longitude" column="longitude" jdbcType="VARCHAR"/>
|
||||||
<result property="dimensionality" column="dimensionality" jdbcType="VARCHAR"/>
|
<result property="latitude" column="dimensionality" jdbcType="VARCHAR"/>
|
||||||
<result property="status" column="status" jdbcType="INTEGER"/>
|
<result property="status" column="status" jdbcType="INTEGER"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
|
@ -33,15 +33,15 @@
|
|||||||
pupu_store.store_id AS storeId,
|
pupu_store.store_id AS storeId,
|
||||||
pupu_store.store_name AS storeName
|
pupu_store.store_name AS storeName
|
||||||
FROM
|
FROM
|
||||||
pupu_store_equipment
|
pupu_equipment
|
||||||
INNER JOIN
|
|
||||||
pupu_ups_history
|
|
||||||
ON
|
|
||||||
pupu_store_equipment.equipment_id = pupu_ups_history.ups_id
|
|
||||||
INNER JOIN
|
INNER JOIN
|
||||||
pupu_store
|
pupu_store
|
||||||
ON
|
ON
|
||||||
pupu_store.store_id = pupu_store_equipment.store_id
|
pupu_equipment.store_id = pupu_store.store_id
|
||||||
|
INNER JOIN
|
||||||
|
pupu_ups_history
|
||||||
|
ON
|
||||||
|
pupu_ups_history.ups_id = pupu_equipment.equipment_id
|
||||||
<where>
|
<where>
|
||||||
<if test="upsId!=null">
|
<if test="upsId!=null">
|
||||||
pupu_ups_history.ups_id = #{upsId}
|
pupu_ups_history.ups_id = #{upsId}
|
||||||
|
Loading…
Reference in New Issue
Block a user