Merge branch 'm33' into 'master'

整合

See merge request !9

license/src/main/java/iot/sixiang/license/controller/DeviceController.java

@@ -50,15 +50,15 @@ public class DeviceController {
      * @param pageNo
      * @param pageSize
      * @param typeName
-     * @param userId
+     * @param userName
      * @return
      */
     @GetMapping("list")
     public PageResult getDeviceList(@RequestParam("pageNo") int pageNo,
                                     @RequestParam("pageSize") int pageSize,
                                     @RequestParam(value = "typeName",required = false) String typeName,
-                                    @RequestParam(value = "userId",required = false) Integer userId) {
-        PageInfoModel<DeviceTypeVo> records = deviceService.getDeviceList(pageNo,pageSize,typeName,userId);
+                                    @RequestParam(value = "userName",required = false) String userName) {
+        PageInfoModel<DeviceTypeVo> records = deviceService.getDeviceList(pageNo,pageSize,typeName,userName);
         int total = records.getTotal();
         int pages = total/pageSize;//pages为总页数
         int mod = total%pageSize;

license/src/main/java/iot/sixiang/license/mapper/DeviceMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceTypeVo> getDeviceList(String typeName, Integer userId);
+    List<DeviceTypeVo> getDeviceList(String typeName, String userName);
 
     boolean addDevice(String sn, int userId, int typeId);
 }

license/src/main/java/iot/sixiang/license/service/DeviceService.java

@@ -15,7 +15,7 @@ import iot.sixiang.license.model.vo.DeviceTypeVo;
  */
 public interface DeviceService extends IService<Device> {
 
-    PageInfoModel<DeviceTypeVo> getDeviceList(int pageNo, int pageSize, String typeName, Integer userId);
+    PageInfoModel<DeviceTypeVo> getDeviceList(int pageNo, int pageSize, String typeName, String userName);
 
     boolean addDevice(int userId, int typeId, int count);
 }

license/src/main/java/iot/sixiang/license/service/impl/DeviceServiceImpl.java

@@ -28,9 +28,10 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
 
     @Resource
     private DeviceMapper deviceMapper;
+
     @Override
-    public PageInfoModel<DeviceTypeVo> getDeviceList(int pageNo, int pageSize, String typeName, Integer userId) {
-        List<DeviceTypeVo> deviceTypes = deviceMapper.getDeviceList(typeName,userId);
+    public PageInfoModel<DeviceTypeVo> getDeviceList(int pageNo, int pageSize, String typeName, String userName) {
+        List<DeviceTypeVo> deviceTypes = deviceMapper.getDeviceList(typeName,userName);
         deviceTypes = deviceTypes.stream().sorted(Comparator.comparing(DeviceTypeVo::getDeviceId)).collect(Collectors.toList());
         List<DeviceTypeVo> result = new ArrayList<>();
         int begin = (pageNo - 1) * pageSize;

license/src/main/resources/mapper/DeviceMapper.xml

@@ -14,8 +14,8 @@
         <if test="null != typeName and '' != typeName">
             and type_name like concat('%',#{typeName},'%')
         </if>
-        <if test="null != userId and '' != userId">
-            and us.user_id like concat('%',#{userId},'%')
+        <if test="null != userName and '' != userName">
+            and us.user_name like concat('%',#{userName},'%')
         </if>
     </select>