Merge branch 'dev_lch' into dev

# Conflicts:
#	share-system/src/main/resources/mapper/system/DeviceLogMapper.xml
#	share-system/src/main/resources/mapper/system/DeviceStatusLogMapper.xml
#	share-system/src/main/resources/mapper/system/SRoomMapper.xml

share-admin/src/main/java/share/web/controller/system/DeviceController.java

@@ -17,6 +17,7 @@ import share.common.core.controller.BaseController;
 import share.common.core.domain.AjaxResult;
 import share.common.enums.BusinessType;
 import share.common.utils.SecurityUtils;
+import share.system.domain.DeviceDto;
 import share.system.mqtt.MqttGatewayComponent;
 import share.system.domain.Device;
 import share.system.domain.vo.DeviceParamVo;
@@ -51,7 +52,7 @@ public class DeviceController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:device:list')")
     @GetMapping("/list")
-    public TableDataInfo list(Device device)
+    public TableDataInfo list(DeviceDto device)
     {
         startPage();
         List<Device> list = deviceService.selectDeviceList(device);

share-admin/src/main/java/share/web/controller/system/DeviceGatewayController.java

@@ -18,6 +18,7 @@ import share.common.core.domain.AjaxResult;
 import share.common.enums.BusinessType;
 import share.common.utils.SecurityUtils;
 import share.system.domain.DeviceGateway;
+import share.system.domain.DeviceGatewayDto;
 import share.system.service.DeviceGatewayService;
 import share.common.utils.poi.ExcelUtil;
 import share.common.core.page.TableDataInfo;
@@ -43,10 +44,10 @@ public class DeviceGatewayController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:gateway:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DeviceGateway deviceGateway)
+    public TableDataInfo list(DeviceGatewayDto deviceGatewayDto)
     {
         startPage();
-        List<DeviceGateway> list = deviceGatewayService.selectDeviceGatewayList(deviceGateway);
+        List<DeviceGateway> list = deviceGatewayService.selectDeviceGatewayList(deviceGatewayDto);
         return getDataTable(list);
     }
 
@@ -56,10 +57,10 @@ public class DeviceGatewayController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:gateway:export')")
     @Log(title = "设备网关信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, DeviceGateway deviceGateway)
+    public void export(HttpServletResponse response, DeviceGatewayDto deviceGateway)
     {
         List<DeviceGateway> list = deviceGatewayService.selectDeviceGatewayList(deviceGateway);
-        ExcelUtil<DeviceGateway> util = new ExcelUtil<DeviceGateway>(DeviceGateway.class);
+        ExcelUtil<DeviceGateway> util = new ExcelUtil<>(DeviceGateway.class);
         util.exportExcel(response, list, "设备网关信息数据");
     }
 

share-admin/src/main/java/share/web/controller/system/DeviceLogController.java

@@ -17,6 +17,7 @@ import share.common.core.controller.BaseController;
 import share.common.core.domain.AjaxResult;
 import share.common.enums.BusinessType;
 import share.system.domain.DeviceLog;
+import share.system.domain.DeviceLogDto;
 import share.system.service.DeviceLogService;
 import share.common.utils.poi.ExcelUtil;
 import share.common.core.page.TableDataInfo;
@@ -39,7 +40,7 @@ public class DeviceLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:log:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DeviceLog deviceLog)
+    public TableDataInfo list(DeviceLogDto deviceLog)
     {
         startPage();
         List<DeviceLog> list = deviceLogService.selectDeviceLogList(deviceLog);

share-admin/src/main/java/share/web/controller/system/DeviceStatusLogController.java

@@ -17,6 +17,7 @@ import share.common.core.controller.BaseController;
 import share.common.core.domain.AjaxResult;
 import share.common.enums.BusinessType;
 import share.system.domain.DeviceStatusLog;
+import share.system.domain.DeviceStatusLogDto;
 import share.system.service.DeviceStatusLogService;
 import share.common.utils.poi.ExcelUtil;
 import share.common.core.page.TableDataInfo;
@@ -39,7 +40,7 @@ public class DeviceStatusLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:statusLog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DeviceStatusLog deviceStatusLog)
+    public TableDataInfo list(DeviceStatusLogDto deviceStatusLog)
     {
         startPage();
         List<DeviceStatusLog> list = deviceStatusLogService.selectDeviceStatusLogList(deviceStatusLog);

share-admin/src/main/java/share/web/controller/system/SaobeiApiLogController.java

@@ -17,6 +17,7 @@ import share.common.core.controller.BaseController;
 import share.common.core.domain.AjaxResult;
 import share.common.enums.BusinessType;
 import share.system.domain.SaobeiApiLog;
+import share.system.domain.SaobeiApiLogDto;
 import share.system.service.SaobeiApiLogService;
 import share.common.utils.poi.ExcelUtil;
 import share.common.core.page.TableDataInfo;
@@ -39,10 +40,10 @@ public class SaobeiApiLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:saobeilog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SaobeiApiLog saobeiApiLog)
+    public TableDataInfo list(SaobeiApiLogDto saobeiApiLogDto)
     {
         startPage();
-        List<SaobeiApiLog> list = saobeiApiLogService.selectSaobeiApiLogList(saobeiApiLog);
+        List<SaobeiApiLogDto> list = saobeiApiLogService.selectSaobeiApiLogList(saobeiApiLogDto);
         return getDataTable(list);
     }
 
@@ -52,10 +53,10 @@ public class SaobeiApiLogController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:saobeilog:export')")
     @Log(title = "扫呗接口调用日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SaobeiApiLog saobeiApiLog)
+    public void export(HttpServletResponse response, SaobeiApiLogDto saobeiApiLog)
     {
-        List<SaobeiApiLog> list = saobeiApiLogService.selectSaobeiApiLogList(saobeiApiLog);
-        ExcelUtil<SaobeiApiLog> util = new ExcelUtil<SaobeiApiLog>(SaobeiApiLog.class);
+        List<SaobeiApiLogDto> list = saobeiApiLogService.selectSaobeiApiLogList(saobeiApiLog);
+        ExcelUtil<SaobeiApiLogDto> util = new ExcelUtil<>(SaobeiApiLogDto.class);
         util.exportExcel(response, list, "扫呗接口调用日志数据");
     }
 

share-system/src/main/java/share/system/domain/Device.java

@@ -106,6 +106,7 @@ public class Device extends BaseEntity
             .append("gatewayId", getGatewayId())
             .append("voltage", getVoltage())
             .append("signalValue", getSignalValue())
+            .append("roomId", getRoomId())
             .toString();
     }
 }

share-system/src/main/java/share/system/domain/DeviceDto.java

+package share.system.domain;
+
+import lombok.Data;
+
+/**
+ * @author lichenghu
+ * @date 2024/1/25
+ */
+@Data
+public class DeviceDto extends Device {
+    /**
+     * 门店ID
+     */
+    private Long storeId;
+}

share-system/src/main/java/share/system/domain/DeviceGatewayDto.java

+package share.system.domain;
+
+import lombok.Data;
+
+/**
+ * @author lichenghu
+ * @date 2024/1/25
+ */
+@Data
+public class DeviceGatewayDto extends DeviceGateway {
+    /**
+     * 门店id
+     */
+    private String storeId;
+}

share-system/src/main/java/share/system/domain/DeviceLogDto.java

+package share.system.domain;
+
+import lombok.Data;
+
+/**
+ * @author lichenghu
+ * @date 2024/1/25
+ */
+@Data
+public class DeviceLogDto extends DeviceLog {
+    /**
+     * 门店id
+     */
+    private Long storeId;
+    /**
+     * 房间id
+     */
+    private Long roomId;
+}

share-system/src/main/java/share/system/domain/DeviceStatusLogDto.java

+package share.system.domain;
+
+import lombok.Data;
+
+/**
+ * @author lichenghu
+ * @date 2024/1/25
+ */
+@Data
+public class DeviceStatusLogDto extends DeviceStatusLog {
+    /**
+     * 门店id
+     */
+    private Long storeId;
+}

share-system/src/main/java/share/system/domain/SRoom.java

@@ -32,6 +32,10 @@ public class SRoom extends BaseEntity
     @Excel(name = "门店ID")
     private Long storeId;
 
+    /** 排序值 */
+    @Excel(name = "排序值")
+    private String sort;
+
     /** 房间名称 */
     @Excel(name = "房间名称")
     private String name;

share-system/src/main/java/share/system/domain/SaobeiApiLogDto.java

+package share.system.domain;
+
+import lombok.Data;
+
+/**
+ * @author lichenghu
+ * @date 2024/1/25
+ */
+@Data
+public class SaobeiApiLogDto extends SaobeiApiLog {
+    /**
+     * 门店id
+     */
+    private Long storeId;
+    /**
+     * 房间id
+     */
+    private Long roomId;
+}

share-system/src/main/java/share/system/domain/SmsLog.java

@@ -21,6 +21,14 @@ public class SmsLog extends BaseEntity
     /** 主键 */
     private Long id;
 
+    /** 门店id */
+    @Excel(name = "门店id")
+    private Long storeId;
+
+    /** 房间id */
+    @Excel(name = "房间id")
+    private Long roomId;
+
     /** 发送手机号码 */
     @Excel(name = "发送手机号码")
     private String phone;
@@ -54,6 +62,8 @@ public class SmsLog extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
+            .append("storeId", getStoreId())
+            .append("roomId", getRoomId())
             .append("phone", getPhone())
             .append("templateId", getTemplateId())
             .append("signature", getSignature())

share-system/src/main/java/share/system/domain/vo/SRoomVo.java

@@ -34,6 +34,10 @@ public class SRoomVo extends BaseEntity
     @ApiModelProperty(value = "门店ID")
     private Long storeId;
 
+    /** 排序值 */
+    @Excel(name = "排序值")
+    private String sort;
+
     /** 门店名称 */
     @ApiModelProperty(value = "门店名称")
     private String storeName;
@@ -140,6 +144,7 @@ public class SRoomVo extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
                 .append("storeId", getStoreId())
+                .append("sort", getSort())
                 .append("storeName", getStoreName())
                 .append("name", getName())
                 .append("roomType", getRoomType())

share-system/src/main/java/share/system/mapper/SaobeiApiLogMapper.java

@@ -3,6 +3,7 @@ package share.system.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import share.system.domain.SaobeiApiLog;
+import share.system.domain.SaobeiApiLogDto;
 
 /**
  * 扫呗接口调用日志Mapper接口
@@ -26,7 +27,7 @@ public interface SaobeiApiLogMapper extends BaseMapper<SaobeiApiLog>
      * @param saobeiApiLog 扫呗接口调用日志
      * @return 扫呗接口调用日志集合
      */
-    public List<SaobeiApiLog> selectSaobeiApiLogList(SaobeiApiLog saobeiApiLog);
+    public List<SaobeiApiLogDto> selectSaobeiApiLogList(SaobeiApiLog saobeiApiLog);
 
     /**
      * 新增扫呗接口调用日志

share-system/src/main/java/share/system/service/SaobeiApiLogService.java

@@ -3,6 +3,7 @@ package share.system.service;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import share.system.domain.SaobeiApiLog;
+import share.system.domain.SaobeiApiLogDto;
 
 /**
  * 扫呗接口调用日志Service接口
@@ -26,7 +27,7 @@ public interface SaobeiApiLogService extends IService<SaobeiApiLog>
      * @param saobeiApiLog 扫呗接口调用日志
      * @return 扫呗接口调用日志集合
      */
-    public List<SaobeiApiLog> selectSaobeiApiLogList(SaobeiApiLog saobeiApiLog);
+    public List<SaobeiApiLogDto> selectSaobeiApiLogList(SaobeiApiLog saobeiApiLog);
 
     /**
      * 新增扫呗接口调用日志

share-system/src/main/java/share/system/service/impl/SaobeiApiLogServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import share.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import share.system.domain.SaobeiApiLogDto;
 import share.system.mapper.SaobeiApiLogMapper;
 import share.system.domain.SaobeiApiLog;
 import share.system.service.SaobeiApiLogService;
@@ -40,7 +41,7 @@ public class SaobeiApiLogServiceImpl extends ServiceImpl<SaobeiApiLogMapper, Sao
      * @return 扫呗接口调用日志
      */
     @Override
-    public List<SaobeiApiLog> selectSaobeiApiLogList(SaobeiApiLog saobeiApiLog)
+    public List<SaobeiApiLogDto> selectSaobeiApiLogList(SaobeiApiLog saobeiApiLog)
     {
         return saobeiApiLogMapper.selectSaobeiApiLogList(saobeiApiLog);
     }

share-system/src/main/java/share/system/service/impl/SmsServiceImpl.java

@@ -71,11 +71,13 @@ public class SmsServiceImpl implements SmsService {
      * 短信发送
      *
      * @param phone
+     * @param storeId
+     * @param roomId
      * @return
      */
-    private boolean sendSms(String phone, Integer tag, String content) {
+    private boolean sendSms(String phone, Integer tag, String content, Long storeId, Long roomId) {
         try {
-            JSONObject jsonObject = sendOneSms(phone, content, String.valueOf(tag));
+            JSONObject jsonObject = sendOneSms(phone, content, String.valueOf(tag), storeId, roomId);
             boolean isSendSuccess = Objects.nonNull(jsonObject);
             if (tag == SmsTypeEnum.SMS_CODE_TEMP.getCode()) {
                 if (!isSendSuccess) {
@@ -95,7 +97,7 @@ public class SmsServiceImpl implements SmsService {
     public boolean sendSmsCode(String phone) {
 //        redisUtil.set(sConsumerService.getValidateCodeRedisKey(phone), "123456", Long.valueOf(Constants.CONFIG_KEY_SMS_CODE_EXPIRE), TimeUnit.MINUTES);
         String content = getSmsContent(phone, SmsTypeEnum.SMS_CODE_TEMP.getCode());
-        return sendSms(phone, SmsTypeEnum.SMS_CODE_TEMP.getCode(), content);
+        return sendSms(phone, SmsTypeEnum.SMS_CODE_TEMP.getCode(), content, null, null);
     }
 
     @Override
@@ -104,7 +106,7 @@ public class SmsServiceImpl implements SmsService {
         SysConfig config = sysConfigMapper.checkConfigKeyUnique(SmsTypeEnum.SMS_CLEAN_RECORDS_TEMP.getValue());
         if (config != null) {
             String content = MessageFormat.format(config.getConfigValue(), store.getName(), room.getName(), store.getAddress());
-            return sendSms(phone, SmsTypeEnum.SMS_CLEAN_RECORDS_TEMP.getCode(), content);
+            return sendSms(phone, SmsTypeEnum.SMS_CLEAN_RECORDS_TEMP.getCode(), content, store.getId(), room.getId());
         } else {
             return Boolean.FALSE;
         }
@@ -116,7 +118,7 @@ public class SmsServiceImpl implements SmsService {
         SysConfig config = sysConfigMapper.checkConfigKeyUnique(SmsTypeEnum.SMS_CLEAN_RECORDS_TEMP_15.getValue());
         if (config != null) {
             String content = MessageFormat.format(config.getConfigValue(), store.getName(), room.getName(), store.getAddress());
-            return sendSms(phone, SmsTypeEnum.SMS_CLEAN_RECORDS_TEMP_15.getCode(), content);
+            return sendSms(phone, SmsTypeEnum.SMS_CLEAN_RECORDS_TEMP_15.getCode(), content, store.getId(), room.getId());
         } else {
             return Boolean.FALSE;
         }
@@ -128,7 +130,7 @@ public class SmsServiceImpl implements SmsService {
         SysConfig config = sysConfigMapper.checkConfigKeyUnique(SmsTypeEnum.SMS_ORDER_START_TEMP.getValue());
         if (config != null) {
             String content = MessageFormat.format(config.getConfigValue(), room.getName(), store.getAddress());
-            return sendSms(phone, SmsTypeEnum.SMS_ORDER_START_TEMP.getCode(), content);
+            return sendSms(phone, SmsTypeEnum.SMS_ORDER_START_TEMP.getCode(), content, store.getId(), room.getId());
         } else {
             return Boolean.FALSE;
         }
@@ -140,7 +142,7 @@ public class SmsServiceImpl implements SmsService {
         SysConfig config = sysConfigMapper.checkConfigKeyUnique(SmsTypeEnum.SMS_ORDER_END_TEMP.getValue());
         if (config != null) {
             String content = MessageFormat.format(config.getConfigValue(), room.getName());
-            return sendSms(phone, SmsTypeEnum.SMS_ORDER_END_TEMP.getCode(), content);
+            return sendSms(phone, SmsTypeEnum.SMS_ORDER_END_TEMP.getCode(), content, store.getId(), room.getId());
         } else {
             return Boolean.FALSE;
         }
@@ -152,7 +154,7 @@ public class SmsServiceImpl implements SmsService {
         SysConfig config = sysConfigMapper.checkConfigKeyUnique(SmsTypeEnum.SMS_CLEAN_RECORDS_STOP_TEMP.getValue());
         if (config != null) {
             String content = MessageFormat.format(config.getConfigValue(), store.getName(), room.getName(), store.getAddress());
-            return sendSms(phone, SmsTypeEnum.SMS_CLEAN_RECORDS_STOP_TEMP.getCode(), content);
+            return sendSms(phone, SmsTypeEnum.SMS_CLEAN_RECORDS_STOP_TEMP.getCode(), content, store.getId(), room.getId());
         } else {
             return Boolean.FALSE;
         }
@@ -165,7 +167,7 @@ public class SmsServiceImpl implements SmsService {
         if (config != null) {
             String content = MessageFormat.format(config.getConfigValue(), store.getName(), room.getName(),
                     DeviceStatusEnum.getNameStr(deviceStatusLog.getStatus()));
-            return sendSms(phone, SmsTypeEnum.SMS_DEVICE_ABNORMAL_TEMP.getCode(), content);
+            return sendSms(phone, SmsTypeEnum.SMS_DEVICE_ABNORMAL_TEMP.getCode(), content, store.getId(), room.getId());
         } else {
             return Boolean.FALSE;
         }
@@ -235,11 +237,14 @@ public class SmsServiceImpl implements SmsService {
 
     /**
      * 单独发送
-     * @param phone 手机号
+     *
+     * @param phone   手机号
      * @param content 发送内容
+     * @param storeId 门店id
+     * @param roomId  房间id
      * @return
      */
-    private JSONObject sendOneSms(String phone, String content, String smsType) {
+    private JSONObject sendOneSms(String phone, String content, String smsType, Long storeId, Long roomId) {
         // 发送内容添加短信签名
         String smsContent = StrUtil.concat(true, signature, content);
         JSONObject param = JSONUtil.createObj();
@@ -257,6 +262,8 @@ public class SmsServiceImpl implements SmsService {
         smsLog.setContent(content);
         smsLog.setSignature(signature);
         smsLog.setSmsType(smsType);
+        smsLog.setStoreId(storeId);
+        smsLog.setRoomId(roomId);
         try {
             JSONObject jsonObject = smsUtil.postFrom(url, param);
             smsLog.setResultParam(JSONUtil.toJsonStr(jsonObject));

share-system/src/main/resources/mapper/system/DeviceGatewayMapper.xml

@@ -36,21 +36,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDeviceGatewayList" parameterType="DeviceGateway" resultMap="DeviceGatewayResult">
-        <include refid="selectDeviceGatewayVo"/>
-        <where>  
-            <if test="devName != null  and devName != ''"> and dev_name like concat('%', #{devName}, '%')</if>
-            <if test="devMac != null  and devMac != ''"> and dev_mac = #{devMac}</if>
-            <if test="devId != null  and devId != ''"> and dev_id = #{devId}</if>
-            <if test="devPsw != null  and devPsw != ''"> and dev_psw = #{devPsw}</if>
-            <if test="devVer != null  and devVer != ''"> and dev_ver = #{devVer}</if>
-            <if test="devType != null  and devType != ''"> and dev_type = #{devType}</if>
-            <if test="group != null  and group != ''"> and `group` = #{group}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="mqttIp != null  and mqttIp != ''"> and mqtt_iP = #{mqttIp}</if>
-            <if test="mqttPort != null  and mqttPort != ''"> and mqtt_port = #{mqttPort}</if>
-            <if test="mqttUser != null  and mqttUser != ''"> and mqtt_user = #{mqttUser}</if>
-            <if test="mqttPaswd != null  and mqttPaswd != ''"> and mqtt_paswd = #{mqttPaswd}</if>
-            <if test="devPosition != null  and devPosition != ''"> and dev_position = #{devPosition}</if>
+        select
+        t1.id,
+        t1.dev_name,
+        t1.dev_mac,
+        t1.dev_id,
+        t1.dev_psw,
+        t1.dev_ver,
+        t1.dev_type,
+        t1.`group`,
+        t1.status,
+        t1.mqtt_iP,
+        t1.mqtt_port,
+        t1.mqtt_user,
+        t1.mqtt_paswd,
+        t1.create_by,
+        t1.create_time,
+        t1.update_by,
+        t1.update_time,
+        t1.remark,
+        t1.dev_position,
+        t1.last_report_date,
+        t1.last_report_content
+        from s_device_gateway t1
+        left join s_store t2 on t1.group = t2.device_group
+        <where>
+            <if test="devName != null  and devName != ''">and t1.dev_name like concat('%', #{devName}, '%')</if>
+            <if test="devMac != null  and devMac != ''">and t1.dev_mac = #{devMac}</if>
+            <if test="devId != null  and devId != ''">and t1.dev_id = #{devId}</if>
+            <if test="devPsw != null  and devPsw != ''">and t1.dev_psw = #{devPsw}</if>
+            <if test="devVer != null  and devVer != ''">and t1.dev_ver = #{devVer}</if>
+            <if test="devType != null  and devType != ''">and t1.dev_type = #{devType}</if>
+            <if test="group != null  and group != ''">and `groupt1.` = #{group}</if>
+            <if test="status != null  and status != ''">and t1.status = #{status}</if>
+            <if test="mqttIp != null  and mqttIp != ''">and t1.mqtt_iP = #{mqttIp}</if>
+            <if test="mqttPort != null  and mqttPort != ''">and t1.mqtt_port = #{mqttPort}</if>
+            <if test="mqttUser != null  and mqttUser != ''">and t1.mqtt_user = #{mqttUser}</if>
+            <if test="mqttPaswd != null  and mqttPaswd != ''">and t1.mqtt_paswd = #{mqttPaswd}</if>
+            <if test="devPosition != null  and devPosition != ''">and t1.dev_position = #{devPosition}</if>
+            <if test="storeId != null">and t2.id = #{storeId}</if>
         </where>
     </select>
     

share-system/src/main/resources/mapper/system/DeviceLogMapper.xml

@@ -33,19 +33,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDeviceLogList" parameterType="DeviceLog" resultMap="DeviceLogResult">
-        <include refid="selectDeviceLogVo"/>
-        <where>  
-            <if test="devMac != null  and devMac != ''"> and s1.dev_mac = #{devMac}</if>
-            <if test="devId != null  and devId != ''"> and s1.dev_id = #{devId}</if>
-            <if test="seq != null  and seq != ''"> and s1.seq = #{seq}</if>
-            <if test="mqttType != null  and mqttType != ''"> and s1.mqtt_type = #{mqttType}</if>
-            <if test="mqttDescribe != null  and mqttDescribe != ''"> and s1.mqtt_describe = #{mqttDescribe}</if>
-            <if test="payload != null  and payload != ''"> and s1.payload = #{payload}</if>
-            <if test="topic != null  and topic != ''"> and s1.topic = #{topic}</if>
-            <if test="storeName != null  and storeName != ''"> and s4.name like concat('%', #{storeName}, '%')</if>
-            <if test="roomName != null  and roomName != ''"> and s3.name like concat('%', #{roomName}, '%')</if>
+        select
+        t1.id,
+        t1.dev_mac,
+        t1.dev_id,
+        t1.seq,
+        t1.mqtt_type,
+        t1.mqtt_describe,
+        t1.payload,
+        t1.topic,
+        t1.create_by,
+        t1.create_time,
+        t1.update_by,
+        t1.update_time,
+        t1.remark,
+        t1.`result`,
+        t1.description
+        from s_device_log t1
+        join s_device t2 on t1.dev_id = t2.dev_id
+        join s_room t3 on t2.room_id = t3.id
+        join s_store t4 on t3.store_id = t4.id
+        <where>
+            <if test="devMac != null  and devMac != ''">and t1.dev_mac = #{devMac}</if>
+            <if test="devId != null  and devId != ''">and t1.dev_id = #{devId}</if>
+            <if test="seq != null  and seq != ''">and t1.seq = #{seq}</if>
+            <if test="mqttType != null  and mqttType != ''">and t1.mqtt_type = #{mqttType}</if>
+            <if test="mqttDescribe != null  and mqttDescribe != ''">and t1.mqtt_describe = #{mqttDescribe}</if>
+            <if test="payload != null  and payload != ''">and t1.payload = #{payload}</if>
+            <if test="topic != null  and topic != ''">and t1.topic = #{topic}</if>
+            <if test="storeId != null">and t4.id = #{storeId}</if>
+            <if test="roomId != null">and t3.id = #{roomId}</if>
         </where>
-        order by s1.create_time desc
+        order by create_time desc
     </select>
     
     <select id="selectDeviceLogById" parameterType="Long" resultMap="DeviceLogResult">

share-system/src/main/resources/mapper/system/DeviceMapper.xml

@@ -35,23 +35,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDeviceList" parameterType="Device" resultMap="DeviceResult">
-        <include refid="selectDeviceVo"/>
-        <where>  
-            <if test="devName != null  and devName != ''"> and dev_name like concat('%', #{devName}, '%')</if>
-            <if test="devMac != null  and devMac != ''"> and dev_mac = #{devMac}</if>
-            <if test="devId != null  and devId != ''"> and dev_id = #{devId}</if>
-            <if test="devPsw != null  and devPsw != ''"> and dev_psw = #{devPsw}</if>
-            <if test="devVer != null  and devVer != ''"> and dev_ver = #{devVer}</if>
-            <if test="devType != null  and devType != ''"> and dev_type = #{devType}</if>
-            <if test="projtId != null  and projtId != ''"> and projt_id = #{projtId}</if>
-            <if test="projtPsw != null  and projtPsw != ''"> and projt_psw = #{projtPsw}</if>
-            <if test="group != null  and group != ''"> and `group` = #{group}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="devPosition != null  and devPosition != ''"> and dev_position = #{devPosition}</if>
-            <if test="gatewayId != null  and gatewayId != ''"> and gateway_id = #{gatewayId}</if>
-            <if test="voltage != null  and voltage != ''"> and voltage = #{voltage}</if>
-            <if test="signalValue != null  and signalValue != ''"> and signal_value = #{signalValue}</if>
-            <if test="roomId != null"> and room_id = #{roomId}</if>
+        select
+        t1.id,
+        t1.dev_name,
+        t1.dev_mac,
+        t1.dev_id,
+        t1.dev_psw,
+        t1.dev_ver,
+        t1.dev_type,
+        t1.projt_id,
+        t1.projt_psw,
+        t1.`group`,
+        t1.status,
+        t1.create_by,
+        t1.create_time,
+        t1.update_by,
+        t1.update_time,
+        t1.remark,
+        t1.dev_position,
+        t1.gateway_id,
+        t1.voltage,
+        t1.signal_value,
+        t1.room_id
+        from s_device t1
+        left join s_room t2 on t1.room_id = t2.id
+        left join s_store t3 on t2.store_id = t3.id
+        <where>
+            <if test="devName != null  and devName != ''">and t1.dev_name like concat('%', #{devName}, '%')</if>
+            <if test="devMac != null  and devMac != ''">and t1.dev_mac = #{devMac}</if>
+            <if test="devId != null  and devId != ''">and t1.dev_id = #{devId}</if>
+            <if test="devPsw != null  and devPsw != ''">and t1.dev_psw = #{devPsw}</if>
+            <if test="devVer != null  and devVer != ''">and t1.dev_ver = #{devVer}</if>
+            <if test="devType != null  and devType != ''">and t1.dev_type = #{devType}</if>
+            <if test="projtId != null  and projtId != ''">and t1.projt_id = #{projtId}</if>
+            <if test="projtPsw != null  and projtPsw != ''">and t1.projt_psw = #{projtPsw}</if>
+            <if test="group != null  and group != ''">and `groupt1.` = #{group}</if>
+            <if test="status != null  and status != ''">and t1.status = #{status}</if>
+            <if test="devPosition != null  and devPosition != ''">and t1.dev_position = #{devPosition}</if>
+            <if test="gatewayId != null  and gatewayId != ''">and t1.gateway_id = #{gatewayId}</if>
+            <if test="voltage != null  and voltage != ''">and t1.voltage = #{voltage}</if>
+            <if test="signalValue != null  and signalValue != ''">and t1.signal_value = #{signalValue}</if>
+            <if test="roomId != null">and t1.room_id = #{roomId}</if>
+            <if test="storeId != null">and t3.id = #{storeId}</if>
         </where>
     </select>
 

share-system/src/main/resources/mapper/system/DeviceStatusLogMapper.xml

@@ -32,21 +32,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDeviceStatusLogList" parameterType="DeviceStatusLog" resultMap="DeviceStatusLogResult">
-        <include refid="selectDeviceStatusLogVo"/>
-        <where>  
-            <if test="devId != null  and devId != ''"> and s1.dev_id = #{devId}</if>
-            <if test="devMac != null  and devMac != ''"> and s1.dev_mac = #{devMac}</if>
-            <if test="isAbnormal != null "> and s1.is_abnormal = #{isAbnormal}</if>
-            <if test="status != null  and status != ''"> and s1.status = #{status}</if>
-            <if test="roomId != null "> and s1.room_id = #{roomId}</if>
-            <if test="voltage != null  and voltage != ''"> and s1.voltage = #{voltage}</if>
-            <if test="signalValue != null  and signalValue != ''"> and s1.signal_value = #{signalValue}</if>
-            <if test="operateLogId != null "> and s1.operate_log_id = #{operateLogId}</if>
-            <if test="isSendSms != null "> and s1.is_send_sms = #{isSendSms}</if>
-            <if test="storeName != null  and storeName != ''"> and s4.name like concat('%', #{storeName}, '%')</if>
-            <if test="roomName != null  and roomName != ''"> and s3.name like concat('%', #{roomName}, '%')</if>
+        select
+        t1.id,
+        t1.dev_id,
+        t1.dev_mac,
+        t1.is_abnormal,
+        t1.status,
+        t1.room_id,
+        t1.voltage,
+        t1.signal_value,
+        t1.create_time,
+        t1.update_time,
+        t1.remark,
+        t1.operate_log_id,
+        t1.is_send_sms,
+        t1.previous_status
+        from s_device_status_log t1
+        join s_room t2 on t1.room_id = t2.id
+        join s_store t3 on t2.store_id = t3.id
+        <where>
+            <if test="devId != null  and devId != ''">and t1.dev_id = #{devId}</if>
+            <if test="devMac != null  and devMac != ''">and t1.dev_mac = #{devMac}</if>
+            <if test="isAbnormal != null ">and t1.is_abnormal = #{isAbnormal}</if>
+            <if test="status != null  and status != ''">and t1.status = #{status}</if>
+            <if test="roomId != null ">and t1.room_id = #{roomId}</if>
+            <if test="voltage != null  and voltage != ''">and t1.voltage = #{voltage}</if>
+            <if test="signalValue != null  and signalValue != ''">and t1.signal_value = #{signalValue}</if>
+            <if test="operateLogId != null ">and t1.operate_log_id = #{operateLogId}</if>
+            <if test="isSendSms != null ">and t1.is_send_sms = #{isSendSms}</if>
+            <if test="roomId != null ">and t2.id = #{roomId}</if>
+            <if test="storeId != null ">and t3.id = #{storeId}</if>
         </where>
-        order by s1.create_time desc
+        order by create_time desc
     </select>
     
     <select id="selectDeviceStatusLogById" parameterType="Long" resultMap="DeviceStatusLogResult">

share-system/src/main/resources/mapper/system/SRoomMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="SRoom" id="SRoomResult">
         <result property="id"    column="id"    />
         <result property="storeId"    column="store_id"    />
+        <result property="sort"    column="sort"    />
         <result property="name"    column="name"    />
         <result property="roomType"    column="room_type"    />
         <result property="images"    column="images"    />
@@ -69,6 +70,7 @@
             <if test="params1 != null  and params1 != ''"> and params1 = #{params1}</if>
             <if test="params2 != null  and params2 != ''"> and params2 = #{params2}</if>
         </where>
+        order by sort desc
     </select>
 
     <select id="selectSRoomById" parameterType="Long" resultMap="SRoomResult">
@@ -79,6 +81,7 @@
     <insert id="insertSRoom" parameterType="SRoom" useGeneratedKeys="true" keyProperty="id">
         insert into s_room
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="sort != null">sort,</if>
             <if test="storeId != null">store_id,</if>
             <if test="name != null">name,</if>
             <if test="roomType != null">room_type,</if>
@@ -100,6 +103,7 @@
             <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="sort != null">#{sort},</if>
             <if test="storeId != null">#{storeId},</if>
             <if test="name != null">#{name},</if>
             <if test="roomType != null">#{roomType},</if>
@@ -125,6 +129,7 @@
     <update id="updateSRoom" parameterType="SRoom">
         update s_room
         <trim prefix="SET" suffixOverrides=",">
+            <if test="sort != null">sort = #{sort},</if>
             <if test="storeId != null">store_id = #{storeId},</if>
             <if test="name != null">name = #{name},</if>
             <if test="roomType != null">room_type = #{roomType},</if>

share-system/src/main/resources/mapper/system/SaobeiApiLogMapper.xml

@@ -31,23 +31,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, pay_ver, pay_type, service_id, merchant_no, terminal_id, terminal_ip, terminal_trace, terminal_time, out_trade_no, request_params, response_params, result, result_msg, create_time, create_by, update_by, update_time, remark, flag from s_saobei_api_log
     </sql>
 
-    <select id="selectSaobeiApiLogList" parameterType="SaobeiApiLog" resultMap="SaobeiApiLogResult">
-        <include refid="selectSaobeiApiLogVo"/>
-        <where>  
-            <if test="payVer != null  and payVer != ''"> and pay_ver = #{payVer}</if>
-            <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
-            <if test="serviceId != null  and serviceId != ''"> and service_id = #{serviceId}</if>
-            <if test="merchantNo != null  and merchantNo != ''"> and merchant_no = #{merchantNo}</if>
-            <if test="terminalId != null  and terminalId != ''"> and terminal_id = #{terminalId}</if>
-            <if test="terminalIp != null  and terminalIp != ''"> and terminal_ip = #{terminalIp}</if>
-            <if test="terminalTrace != null  and terminalTrace != ''"> and terminal_trace = #{terminalTrace}</if>
-            <if test="terminalTime != null  and terminalTime != ''"> and terminal_time = #{terminalTime}</if>
-            <if test="outTradeNo != null  and outTradeNo != ''"> and out_trade_no = #{outTradeNo}</if>
-            <if test="requestParams != null  and requestParams != ''"> and request_params = #{requestParams}</if>
-            <if test="responseParams != null  and responseParams != ''"> and response_params = #{responseParams}</if>
-            <if test="result != null  and result != ''"> and result = #{result}</if>
-            <if test="resultMsg != null  and resultMsg != ''"> and result_msg = #{resultMsg}</if>
-            <if test="flag != null  and flag != ''"> and flag = #{flag}</if>
+    <select id="selectSaobeiApiLogList" parameterType="SaobeiApiLog" resultType="SaobeiApiLogDto">
+        select
+        t1.id,
+        t3.store_id,
+        t3.room_id,
+        t1.pay_ver,
+        t1.pay_type,
+        t1.service_id,
+        t1.merchant_no,
+        t1.terminal_id,
+        t1.terminal_ip,
+        t1.terminal_trace,
+        t1.terminal_time,
+        t1.out_trade_no,
+        t1.request_params,
+        t1.response_params,
+        t1.result,
+        t1.result_msg,
+        t1.create_time,
+        t1.create_by,
+        t1.update_by,
+        t1.update_time,
+        t1.remark,
+        t1.flag
+        from s_saobei_api_log t1
+        join s_wechat_pay_info t2 on t1.terminal_trace = t2.out_trade_no
+        join s_order t3 on t2.out_trade_no = t3.out_trade_no
+        <where>
+            <if test="storeId != null">and t3.store_id = #{storeId}</if>
+            <if test="roomId != null">and t3.room_id = #{roomId}</if>
+            <if test="payVer != null  and payVer != ''">and t1.pay_ver = #{payVer}</if>
+            <if test="payType != null  and payType != ''">and t1.pay_type = #{payType}</if>
+            <if test="serviceId != null  and serviceId != ''">and t1.service_id = #{serviceId}</if>
+            <if test="merchantNo != null  and merchantNo != ''">and t1.merchant_no = #{merchantNo}</if>
+            <if test="terminalId != null  and terminalId != ''">and t1.terminal_id = #{terminalId}</if>
+            <if test="terminalIp != null  and terminalIp != ''">and t1.terminal_ip = #{terminalIp}</if>
+            <if test="terminalTrace != null  and terminalTrace != ''">and t1.terminal_trace = #{terminalTrace}</if>
+            <if test="terminalTime != null  and terminalTime != ''">and t1.terminal_time = #{terminalTime}</if>
+            <if test="outTradeNo != null  and outTradeNo != ''">and t1.out_trade_no = #{outTradeNo}</if>
+            <if test="requestParams != null  and requestParams != ''">and t1.request_params = #{requestParams}</if>
+            <if test="responseParams != null  and responseParams != ''">and t1.response_params = #{responseParams}</if>
+            <if test="result != null  and result != ''">and t1.result = #{result}</if>
+            <if test="resultMsg != null  and resultMsg != ''">and t1.result_msg = #{resultMsg}</if>
+            <if test="flag != null  and flag != ''">and t1.flag = #{flag}</if>
         </where>
         order by create_time desc
     </select>

share-system/src/main/resources/mapper/system/SmsLogMapper.xml

@@ -6,6 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="SmsLog" id="SmsLogResult">
         <result property="id"    column="id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="roomId"    column="room_id"    />
         <result property="phone"    column="phone"    />
         <result property="templateId"    column="template_id"    />
         <result property="signature"    column="signature"    />
@@ -21,13 +23,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSmsLogVo">
-        select id, phone, template_id, signature, content, sms_type, create_by, create_time, update_by, update_time, remark, result, result_param from s_sms_log
+        select id, store_id, room_id, phone, template_id, signature, content, sms_type, create_by, create_time, update_by, update_time, remark, result, result_param from s_sms_log
     </sql>
 
     <select id="selectSmsLogList" parameterType="SmsLog" resultMap="SmsLogResult">
         <include refid="selectSmsLogVo"/>
         <where>  
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="storeId != null"> and store_id = #{storeId}</if>
+            <if test="roomId != null"> and room_id = #{roomId}</if>
             <if test="templateId != null  and templateId != ''"> and template_id = #{templateId}</if>
             <if test="signature != null  and signature != ''"> and signature = #{signature}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
@@ -46,6 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertSmsLog" parameterType="SmsLog" useGeneratedKeys="true" keyProperty="id">
         insert into s_sms_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">store_id,</if>
+            <if test="roomId != null">room_id,</if>
             <if test="phone != null">phone,</if>
             <if test="templateId != null">template_id,</if>
             <if test="signature != null">signature,</if>
@@ -60,6 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="resultParam != null">result_param,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">#{storeId},</if>
+            <if test="roomId != null">#{roomId},</if>
             <if test="phone != null">#{phone},</if>
             <if test="templateId != null">#{templateId},</if>
             <if test="signature != null">#{signature},</if>
@@ -78,6 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateSmsLog" parameterType="SmsLog">
         update s_sms_log
         <trim prefix="SET" suffixOverrides=",">
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="roomId != null">room_id = #{roomId},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="templateId != null">template_id = #{templateId},</if>
             <if test="signature != null">signature = #{signature},</if>