~chenjialiang/moral.git

			@@ -12,6 +12,8 @@
			import com.moral.api.mapper.*;
			import com.moral.api.pojo.bo.UserBO;
			import com.moral.api.pojo.enums.FileTableEnum;
			import com.moral.api.pojo.enums.StateEnum;
			import com.moral.api.pojo.enums.SysDictTypeEnum;
			import com.moral.api.pojo.vo.file.FileVo;
			import com.moral.api.service.FileTableService;
			import com.moral.api.service.UserService;
			@@ -100,6 +102,7 @@
			return result;
			}
			ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId());
			List<Integer> list = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_DEVICE.value, userBo.getId());
			//封装用户信息
			Map<String, Object> userInfo = new LinkedHashMap<>();
			userInfo.put("userId", userBo.getId());
			@@ -126,6 +129,7 @@
			List<FileVo> listFile = fileTableService.list(userBo.getId(), FileTableEnum.APP_ALLOCATION.value);
			result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());
			result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"管理员登陆");
			result.put("device",ObjectUtils.isEmpty(list)? StateEnum.NOT_EFFECTIVE.value :StateEnum.TAKE_EFFECT.value);
			} catch (Exception e) {
			log.error("token生成异常：" + e.getMessage());
			result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
			@@ -152,7 +156,7 @@

			// 3.接收微信接口服务获取返回的参数
			String openid = SessionKeyOpenId.getString("openid");
			String sessionKey = SessionKeyOpenId.getString("session_key");
			// String sessionKey = SessionKeyOpenId.getString("session_key");

			// 4.校验签名小程序发送的签名signature与服务器端生成的签名signature2 = sha1(rawData + sessionKey)
			// String signature2 = DigestUtils.sha1Hex(rawData + sessionKey);
			@@ -188,6 +192,7 @@
			userInfo.put("expireTime", DateUtils.dateToDateString(user.getExpireTime()));
			userInfo.put("isAdmin", user.getIsAdmin());
			ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(user.getUnitId());
			List<Integer> list = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_DEVICE.value, user.getId());
			try {
			//生成token，并存入redis
			String token = TokenUtils.getTokenApp(new StringBuffer("00").append(user.getId().toString()).toString(),userInfo);
			@@ -198,6 +203,7 @@
			result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());
			result.put("userId", user.getId());
			result.put("account", user.getAccount());
			result.put("device",ObjectUtils.isEmpty(list)? StateEnum.NOT_EFFECTIVE.value : StateEnum.TAKE_EFFECT.value);
			result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"管理员登陆");
			} catch (Exception e) {
			log.error("token生成异常：" + e.getMessage());

	screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java	4 ●●●●● patch \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java	8 ●●●●● patch \| view \| raw \| blame \| history

			@@ -39,7 +39,9 @@
			*/
			WIND_FARM_SCOPE("WIND","风场范围"),

			SYS_DEVICE("DEVICE","设备秒机数据")
			SYS_DEVICE("DEVICE","设备秒机数据"),


			;

			@EnumValue