feat:app接口添加规则相关接口

iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java

@@ -9,6 +9,8 @@
  */
 package cc.iotkit.manager.controller;
 
+import cc.iotkit.common.api.PageRequest;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.common.api.Request;
 import cc.iotkit.common.constant.Constants;
 import cc.iotkit.common.enums.ErrCode;
@@ -21,7 +23,9 @@ import cc.iotkit.data.manager.IDeviceInfoData;
 import cc.iotkit.data.manager.IUserInfoData;
 import cc.iotkit.manager.dto.bo.device.ServiceInvokeBo;
 import cc.iotkit.manager.dto.bo.device.SetDeviceServicePorpertyBo;
+import cc.iotkit.manager.dto.bo.ruleinfo.RuleInfoBo;
 import cc.iotkit.manager.dto.vo.product.ProductVo;
+import cc.iotkit.manager.dto.vo.ruleinfo.RuleInfoVo;
 import cc.iotkit.manager.dto.vo.thingmodel.ThingModelVo;
 import cc.iotkit.manager.model.vo.FindDeviceVo;
 import cc.iotkit.manager.model.vo.SpaceDeviceVo;
@@ -70,6 +74,8 @@ public class SpaceDeviceController {
     @Autowired
     private DataOwnerService dataOwnerService;
     @Autowired
+    private IRuleEngineService ruleEngineService;
+    @Autowired
     private IUserInfoData userInfoData;
     @Autowired
     private IDeviceManagerService deviceServiceImpl;
@@ -229,6 +235,39 @@ public class SpaceDeviceController {
         return deviceServiceImpl.getDetail(request.getData());
     }
 
+    @ApiOperation("保存规则")
+    @PostMapping("/saveRuleEngine")
+    public boolean saveRuleEngine(@RequestBody @Validated Request<RuleInfoBo> ruleInfoBo) {
+        return ruleEngineService.saveRule(ruleInfoBo.getData());
+    }
+
+    @ApiOperation("删除规则")
+    @PostMapping("/delRuleEngine")
+    public boolean delRuleEngine(@Validated @RequestBody Request<String> request) {
+        String ruleId = request.getData();
+        return ruleEngineService.deleteRule(ruleId);
+    }
+
+    @ApiOperation("停止规则")
+    @PostMapping("/stopRuleEngine")
+    public boolean stopRuleEngine(@Validated @RequestBody Request<String> request) {
+        String ruleId = request.getData();
+        return ruleEngineService.pauseRule(ruleId);
+    }
+
+    @ApiOperation("恢复规则")
+    @PostMapping("/startRuleEngine")
+    public boolean startRuleEngine(@Validated @RequestBody Request<String> request) {
+        String ruleId = request.getData();
+        return ruleEngineService.resumeRule(ruleId);
+    }
+
+    @ApiOperation("规则列表")
+    @PostMapping("/ruleEngineList")
+    public Paging<RuleInfoVo> ruleEngineList(@Validated @RequestBody PageRequest<RuleInfoBo> request) {
+        return ruleEngineService.selectPageList(request);
+    }
+
     @ApiOperation("调用设备服务")
     @PostMapping("/invokeService")
     public InvokeResult invokeService(@RequestBody @Validated Request<ServiceInvokeBo> request) {

iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/UserInfoController.java

@@ -13,6 +13,7 @@ import cc.iotkit.common.constant.Constants;
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.satoken.utils.AuthUtil;
+import cc.iotkit.common.satoken.utils.LoginHelper;
 import cc.iotkit.common.utils.ReflectUtil;
 import cc.iotkit.data.manager.IHomeData;
 import cc.iotkit.data.manager.ISpaceData;
@@ -128,6 +129,11 @@ public class UserInfoController {
         userInfoData.deleteById(id);
     }
 
+    @PostMapping("/getUserInfo")
+    public UserInfo getUserInfo() {
+        return userInfoData.findById(LoginHelper.getUserId());
+    }
+
     @PostMapping("/client/user/save")
     public void saveClientUser(@RequestBody UserInfo user) {
         UserInfo oldUser = userInfoData.findById(user.getId());

iot-starter/src/main/java/cc/iotkit/web/service/SysLoginService.java

@@ -149,9 +149,7 @@ public class SysLoginService {
         if(sysApp==null){
             throw new BizException("该应用未授权注册");
         }
-        String url=authUrl+"?appid="+appId+"&secret="+sysApp.getAppSecret()+"&js_code="+xcxCode+"&grant_type=authorization_code";
-        String ret=WeChatUtil.httpRequest(url,"GET",null);
-        String openid = JsonUtils.parseMap(ret).getStr("openid");
+        String openid = WeChatUtil.getOpenId(appId,sysApp.getAppSecret(),xcxCode);
         UserInfo user = null;
         LoginHelper.setTenantId(sysApp.getTenantId());
         try {
@@ -319,6 +317,7 @@ public class SysLoginService {
             user.setType(UserInfo.USER_TYPE_CLIENT);
             user.setUid(openid);
             user.setRoles(Collections.singletonList(Constants.ROLE_CLIENT));
+            user.setNickName("微信用户");
             user.setSecret(AuthUtil.enCryptPwd(Constants.PWD_CLIENT_USER));
             user.setTenantId(tenantId);
             user = userInfoData.save(user);