2021/7/8 牧场选择下拉框修改

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/dao/HealthMedicalRecordDao.java

@@ -13,7 +13,7 @@ import java.util.List;
  * 
  * 
  * @author yinhao
- * @email yinhao@163.com
+ * @version 1.0
  * @date 2021-06-10 09:44:06
  */
 @Mapper

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/tcp/Server.java

@@ -43,8 +43,6 @@ public class Server implements CommandLineRunner {
             }
         } catch (IOException e) {
             e.printStackTrace();
-        } finally {
-
         }
     }
 }

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/tcp/ServerThread.java

@@ -36,7 +36,7 @@ public class ServerThread extends Thread {
             inputStream.read(b);
             String packet = new String(b);
             packet = packet.trim();
-
+            System.out.println(packet);
             // 处理数据包
             iClientDataPacketService.handleClientSendPacket(packet);
 

huimv-smart-management/src/main/java/com/huimv/management/controller/CameraBrandController.java

@@ -83,4 +83,14 @@ public class CameraBrandController {
         return R.ok();
     }
 
+    /**
+     * 查询所有
+     */
+    @RequestMapping("/findAll")
+    public R findAll(){
+
+
+        return R.ok().put("data",cameraBrandService.list());
+    }
+
 }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/CameraBrandServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.management.service.impl;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -24,9 +25,15 @@ public class CameraBrandServiceImpl extends ServiceImpl<CameraBrandDao, CameraBr
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+        QueryWrapper<CameraBrandEntity> wrapper = new QueryWrapper<>();
+
+        String keyword = (String)params.get("keyword");
+        wrapper.like(StringUtils.isNotBlank(keyword),"brand_name",keyword);
+
+
         IPage<CameraBrandEntity> page = this.page(
                 new Query<CameraBrandEntity>().getPage(params),
-                new QueryWrapper<CameraBrandEntity>()
+                wrapper
         );
 
         return new PageUtils(page);

renren-fast/src/main/java/io/renren/modules/sys/controller/SysUserController.java

@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2016-2019 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
 package io.renren.modules.sys.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.renren.common.annotation.SysLog;
 import io.renren.common.utils.Constant;
 import io.renren.common.utils.PageUtils;
@@ -16,7 +18,9 @@ import io.renren.common.validator.Assert;
 import io.renren.common.validator.ValidatorUtils;
 import io.renren.common.validator.group.AddGroup;
 import io.renren.common.validator.group.UpdateGroup;
+import io.renren.modules.sys.dao.SysUserFarmChooseDao;
 import io.renren.modules.sys.entity.SysUserEntity;
+import io.renren.modules.sys.entity.SysUserFarmChooseEntity;
 import io.renren.modules.sys.form.PasswordForm;
 import io.renren.modules.sys.service.SysUserRoleService;
 import io.renren.modules.sys.service.SysUserService;
@@ -39,119 +43,159 @@ import java.util.Map;
 @RestController
 @RequestMapping("/sys/user")
 public class SysUserController extends AbstractController {
-	@Autowired
-	private SysUserService sysUserService;
-	@Autowired
-	private SysUserRoleService sysUserRoleService;
-
-
-	/**
-	 * 所有用户列表
-	 */
-	@GetMapping("/list")
-	@RequiresPermissions("sys:user:list")
-	public R list(@RequestParam Map<String, Object> params){
-		//只有超级管理员，才能查看所有管理员列表
-		if(getUserId() != Constant.SUPER_ADMIN && getUserId() != 2){
-			params.put("createUserId", getUserId());
-		}
-		PageUtils page = sysUserService.queryPage(params);
-
-		return R.ok().put("page", page);
-	}
-	
-	/**
-	 * 获取登录的用户信息
-	 */
-	@GetMapping("/info")
-	public R info(){
-		return R.ok().put("user", getUser());
-	}
-	
-	/**
-	 * 修改登录用户密码
-	 */
-	@SysLog("修改密码")
-	@PostMapping("/password")
-	public R password(@RequestBody PasswordForm form){
-		Assert.isBlank(form.getNewPassword(), "新密码不为能空");
-		
-		//sha256加密
-		String password = new Sha256Hash(form.getPassword(), getUser().getSalt()).toHex();
-		//sha256加密
-		String newPassword = new Sha256Hash(form.getNewPassword(), getUser().getSalt()).toHex();
-				
-		//更新密码
-		boolean flag = sysUserService.updatePassword(getUserId(), password, newPassword);
-		if(!flag){
-			return R.error("原密码不正确");
-		}
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 用户信息
-	 */
-	@GetMapping("/info/{userId}")
-	@RequiresPermissions("sys:user:info")
-	public R info(@PathVariable("userId") Long userId){
-		SysUserEntity user = sysUserService.getById(userId);
-		
-		//获取用户所属的角色列表
-		List<Long> roleIdList = sysUserRoleService.queryRoleIdList(userId);
-		user.setRoleIdList(roleIdList);
-		
-		return R.ok().put("user", user);
-	}
-	
-	/**
-	 * 保存用户
-	 */
-	@SysLog("保存用户")
-	@PostMapping("/save")
-	@RequiresPermissions("sys:user:save")
-	public R save(@Validated(AddGroup.class) @RequestBody SysUserEntity user){
-		//ValidatorUtils.validateEntity(user, AddGroup.class);
-		
-		user.setCreateUserId(getUserId());
-		sysUserService.saveUser(user);
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 修改用户
-	 */
-	@SysLog("修改用户")
-	@PostMapping("/update")
-	@RequiresPermissions("sys:user:update")
-	public R update(@Validated(UpdateGroup.class) @RequestBody SysUserEntity user){
-		//ValidatorUtils.validateEntity(user, UpdateGroup.class);
-
-		user.setCreateUserId(getUserId());
-		sysUserService.update(user);
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 删除用户
-	 */
-	@SysLog("删除用户")
-	@PostMapping("/delete")
-	@RequiresPermissions("sys:user:delete")
-	public R delete(@RequestBody Long[] userIds){
-		if(ArrayUtils.contains(userIds, 1L)){
-			return R.error("系统管理员不能删除");
-		}
-		
-		if(ArrayUtils.contains(userIds, getUserId())){
-			return R.error("当前用户不能删除");
-		}
-		
-		sysUserService.deleteBatch(userIds);
-		
-		return R.ok();
-	}
+    @Autowired
+    private SysUserService sysUserService;
+    @Autowired
+    private SysUserRoleService sysUserRoleService;
+
+
+    /**
+     * 所有用户列表
+     */
+    @GetMapping("/list")
+    @RequiresPermissions("sys:user:list")
+    public R list(@RequestParam Map<String, Object> params) {
+        //只有超级管理员，才能查看所有管理员列表
+        if (getUserId() != Constant.SUPER_ADMIN && getUserId() != 2) {
+            params.put("createUserId", getUserId());
+        }
+        PageUtils page = sysUserService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+    /**
+     * 获取登录的用户信息
+     */
+    @GetMapping("/info")
+    public R info() {
+        return R.ok().put("user", getUser());
+    }
+
+    /**
+     * 修改登录用户密码
+     */
+    @SysLog("修改密码")
+    @PostMapping("/password")
+    public R password(@RequestBody PasswordForm form) {
+        Assert.isBlank(form.getNewPassword(), "新密码不为能空");
+
+        //sha256加密
+        String password = new Sha256Hash(form.getPassword(), getUser().getSalt()).toHex();
+        //sha256加密
+        String newPassword = new Sha256Hash(form.getNewPassword(), getUser().getSalt()).toHex();
+
+        //更新密码
+        boolean flag = sysUserService.updatePassword(getUserId(), password, newPassword);
+        if (!flag) {
+            return R.error("原密码不正确");
+        }
+
+        return R.ok();
+    }
+
+    /**
+     * 用户信息
+     */
+    @GetMapping("/info/{userId}")
+    @RequiresPermissions("sys:user:info")
+    public R info(@PathVariable("userId") Long userId) {
+        SysUserEntity user = sysUserService.getById(userId);
+
+        //获取用户所属的角色列表
+        List<Long> roleIdList = sysUserRoleService.queryRoleIdList(userId);
+        user.setRoleIdList(roleIdList);
+
+        return R.ok().put("user", user);
+    }
+
+    /**
+     * 保存用户
+     */
+    @SysLog("保存用户")
+    @PostMapping("/save")
+    @RequiresPermissions("sys:user:save")
+    public R save(@Validated(AddGroup.class) @RequestBody SysUserEntity user) {
+        //ValidatorUtils.validateEntity(user, AddGroup.class);
+
+        user.setCreateUserId(getUserId());
+        sysUserService.saveUser(user);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改用户
+     */
+    @SysLog("修改用户")
+    @PostMapping("/update")
+    @RequiresPermissions("sys:user:update")
+    public R update(@Validated(UpdateGroup.class) @RequestBody SysUserEntity user) {
+        //ValidatorUtils.validateEntity(user, UpdateGroup.class);
+
+        user.setCreateUserId(getUserId());
+        sysUserService.update(user);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除用户
+     */
+    @SysLog("删除用户")
+    @PostMapping("/delete")
+    @RequiresPermissions("sys:user:delete")
+    public R delete(@RequestBody Long[] userIds) {
+        if (ArrayUtils.contains(userIds, 1L)) {
+            return R.error("系统管理员不能删除");
+        }
+
+        if (ArrayUtils.contains(userIds, getUserId())) {
+            return R.error("当前用户不能删除");
+        }
+
+        sysUserService.deleteBatch(userIds);
+
+        return R.ok();
+    }
+
+
+    @Autowired
+    private SysUserFarmChooseDao sysUserFarmChooseDao;
+
+    @SysLog("查询用户上次选择牧场")
+    @GetMapping("/findLatestChooseFarm")
+    @RequiresPermissions("sys:user:info")
+    public Integer findLatestChooseFarm() {
+        Long userId = getUserId();
+        LambdaQueryWrapper<SysUserFarmChooseEntity> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        SysUserFarmChooseEntity latestData = sysUserFarmChooseDao.selectOne(lambdaQueryWrapper.eq(SysUserFarmChooseEntity::getUserId, userId));
+        if (latestData != null) {
+            return latestData.getFarmId();
+        }
+        return null;
+    }
+
+    @SysLog("保存用户所选择的牧场")
+    @GetMapping("/saveChooseFarm")
+    @RequiresPermissions("sys:user:save")
+    public R saveChooseFarm(@RequestParam("farmId") Integer farmId) {
+        Long userId = getUserId();
+        LambdaQueryWrapper<SysUserFarmChooseEntity> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        SysUserFarmChooseEntity latestData = sysUserFarmChooseDao.selectOne(lambdaQueryWrapper.eq(SysUserFarmChooseEntity::getUserId, userId));
+
+        SysUserFarmChooseEntity entity = new SysUserFarmChooseEntity();
+        entity.setFarmId(farmId);
+        if (latestData == null) {
+            entity.setUserId(userId);
+            sysUserFarmChooseDao.insert(entity);
+        } else {
+
+            sysUserFarmChooseDao.update(entity,lambdaQueryWrapper);
+        }
+        return R.ok().put("msg", "保存选择牧场记录成功!");
+
+    }
+
+
 }

renren-fast/src/main/java/io/renren/modules/sys/dao/SysUserFarmChooseDao.java

@@ -0,0 +1,19 @@
+package io.renren.modules.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.renren.modules.sys.entity.SysUserFarmChooseEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/7/9 13:47
+ */
+@Mapper
+@Repository
+public interface SysUserFarmChooseDao extends BaseMapper<SysUserFarmChooseEntity> {
+}

renren-fast/src/main/java/io/renren/modules/sys/entity/SysUserFarmChooseEntity.java

@@ -0,0 +1,27 @@
+package io.renren.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * <p>
+ * 用户选择牧场表
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/7/9 13:43
+ */
+@Data
+@TableName("sys_user_farm_choose")
+public class SysUserFarmChooseEntity {
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 牧场id
+     */
+    private Integer farmId;
+}