Преглед на файлове

一键启动,调用计算程序同步数据并计算更新(如果在调用此接口之前已经存在数据同步任务和计算任务会强行中止,然后执行数据同步,数据同步完成后自动计算)

lw преди 1 година
родител
ревизия
93bb13653a

+ 2 - 1
module_kzks/src/main/java/org/jeecg/modules/Index/service/impl/IndexZcbServiceImpl.java

@@ -77,7 +77,8 @@ public class IndexZcbServiceImpl implements IndexZcbService {
      */
     @Override
     public List<IndexTotalVo> getZhiChuTotalList(HttpServletRequest request,List<String> departNameList) {
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userNameByToken = JwtUtil.getUserNameByToken(request);
+        LoginUser sysUser = iSysBaseAPI.getUserByName(userNameByToken);
         ArrayList<IndexTotalVo> projectZhiChusList = new ArrayList<>();
         IndexTotalVo projectZhiChu = new IndexTotalVo();
         // 获取当前登录的用户名

+ 41 - 0
module_kzks/src/main/java/org/jeecg/modules/visibleClient/controller.java

@@ -0,0 +1,41 @@
+package org.jeecg.modules.visibleClient;
+
+
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.TypeReference;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Map;
+
+@Api(tags="计算程序客户端调用")
+@RestController
+@RequestMapping("/visibleClient")
+public class controller {
+
+    @Autowired
+    private RestTemplate restTemplate;
+    @ApiOperation(value="一键启动,调用计算程序同步数据并计算更新", notes="一键启动,调用计算程序同步数据并计算更新")
+    @GetMapping("start")
+    public Result<String> startSummary(){
+        String url = "http://127.0.0.1/dev-api/visibleServer/start";
+        ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
+        String body = forEntity.getBody();
+        Map<String, String> map = JSONObject.parseObject(body, new TypeReference<Map<String, String>>() {
+        });
+        String s = null;
+        if (map != null) {
+             s = map.get("msg");
+        }
+        if (s != null && s.equals("启动成功"))  return Result.ok("启动成功");
+        if (s!=null && s.equals("请勿重复启动")) return Result.ok("请勿重复启动");
+        return Result.ok("启动失败");
+    }
+}