|
@@ -1,16 +1,21 @@
|
|
|
package com.huimv.env.admin.controller;
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.huimv.env.admin.common.token.TokenSign;
|
|
|
import com.huimv.env.admin.common.utils.Result;
|
|
|
import com.huimv.env.admin.common.utils.ResultCode;
|
|
|
import com.huimv.env.admin.common.utils.UploadImage;
|
|
|
import com.huimv.env.admin.entity.AccountGroup;
|
|
|
+import com.huimv.env.admin.entity.BaseFarm;
|
|
|
+import com.huimv.env.admin.entity.Farm;
|
|
|
import com.huimv.env.admin.entity.SysAccountMultilevel;
|
|
|
import com.huimv.env.admin.service.IAccountGroupService;
|
|
|
+import com.huimv.env.admin.service.IBaseFarmService;
|
|
|
import com.huimv.env.admin.service.ISysAccountGroupService;
|
|
|
import com.huimv.env.admin.service.ISysAccountMultilevelService;
|
|
|
+import com.huimv.env.admin.session.AccessToken;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
@@ -19,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.io.IOException;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
@@ -36,6 +42,8 @@ import java.util.Map;
|
|
|
public class SysAccountMultilevelController {
|
|
|
@Autowired
|
|
|
private ISysAccountMultilevelService accountMultilevelService;
|
|
|
+ @Autowired
|
|
|
+ private IBaseFarmService farmService;
|
|
|
|
|
|
@Autowired
|
|
|
private IAccountGroupService accountGroupService;
|
|
@@ -79,10 +87,29 @@ public class SysAccountMultilevelController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/update")
|
|
|
- public Result update(@RequestBody SysAccountMultilevel sysAccountMultilevel){
|
|
|
+ public Result update(HttpServletRequest req,@RequestBody SysAccountMultilevel sysAccountMultilevel){
|
|
|
accountMultilevelService.updateById(sysAccountMultilevel);
|
|
|
-
|
|
|
- return new Result(10000,"修改成功",true);
|
|
|
+ String remoteHost = req.getRemoteHost();
|
|
|
+ AccessToken accessToken = new AccessToken();
|
|
|
+ accessToken.setCreated(new Date());
|
|
|
+ accessToken.setAccountName(sysAccountMultilevel.getAccount());
|
|
|
+ accessToken.setFarmId(sysAccountMultilevel.getFarmIds());
|
|
|
+ Integer lastFarmId = sysAccountMultilevel.getLastFarmId();
|
|
|
+ if (ObjectUtil.isEmpty(lastFarmId)) {
|
|
|
+ lastFarmId = Integer.parseInt(sysAccountMultilevel.getFarmIds().split(",")[0]);
|
|
|
+ }
|
|
|
+ accessToken.setLastFarmId(lastFarmId);
|
|
|
+ BaseFarm farm = farmService.getById(lastFarmId);
|
|
|
+ String token = TokenSign.sign(sysAccountMultilevel.getAccount(), sysAccountMultilevel.getId(), sysAccountMultilevel.getFarmIds(), null, null,farm.getLng(),farm.getLat());
|
|
|
+ accessToken.setToken(token);
|
|
|
+
|
|
|
+ accessToken.setId(sysAccountMultilevel.getId());
|
|
|
+ accessToken.setLoginIp(remoteHost);
|
|
|
+ accessToken.setType(sysAccountMultilevel.getType());
|
|
|
+ accessToken.setLat(farm.getLat());
|
|
|
+ accessToken.setLng(farm.getLng());
|
|
|
+ accessToken.setUserName(sysAccountMultilevel.getUserName());
|
|
|
+ return new Result(ResultCode.SUCCESS,accessToken);
|
|
|
|
|
|
}
|
|
|
|