月度信息修改

master
杜函宇 3 days ago
parent 31fa480c07
commit 40f0f1ed94

@ -7,7 +7,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.docking.entity.ProjectProgress;
import com.ruoyi.docking.entity.request.YdxxtjRequest;
import com.ruoyi.docking.service.ProjectProgressService;
import com.ruoyi.gysl.entity.BuildingInformation;
import com.ruoyi.gysl.entity.request.ZwIdPageReq;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -44,7 +43,7 @@ public class ProjectProgressController extends BaseController {
@ApiOperation(value = "查询所有数据", response = ProjectProgress.class)
@GetMapping("/page")
public AjaxResult selectAll(ZwIdPageReq zwIdPageReq) {
return success(projectProgressService.page( zwIdPageReq));
return success(projectProgressService.page(zwIdPageReq));
}
@ -70,9 +69,9 @@ public class ProjectProgressController extends BaseController {
@ApiOperation("修改数据")
@PutMapping("/edit")
public AjaxResult update(@RequestBody ProjectProgress projectProgress) {
if(projectProgress.getId()!=null){
if (projectProgress.getId() != null) {
return AjaxResult.success(projectProgressService.updateById(projectProgress));
}else {
} else {
return AjaxResult.success(projectProgressService.save(projectProgress));
}
}
@ -104,7 +103,7 @@ public class ProjectProgressController extends BaseController {
@ApiOperation(value = "根据条件导出所有月度信息")
@PostMapping(value = "/export")
public void export(HttpServletResponse response, @Valid ZwIdPageReq zwIdPageReq) throws Exception {
List<ProjectProgress> p1 = projectProgressService.page( zwIdPageReq);
List<ProjectProgress> p1 = projectProgressService.page(zwIdPageReq);
ExcelUtil<ProjectProgress> util = new ExcelUtil<>(ProjectProgress.class);
util.exportExcel(response, p1, "月度信息");
}

@ -9,9 +9,15 @@ import cn.hutool.crypto.digest.DigestUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.gysl.entity.BasicInformation;
import com.ruoyi.gysl.login.dto.response.UserMainResponse;
import com.ruoyi.gysl.login.dto.response.UserResponse;
import com.ruoyi.gysl.login.service.LoginTokenService;
import com.ruoyi.gysl.service.BasicInformationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Value;
@ -38,7 +44,6 @@ import java.util.Map;
@RequestMapping("/system/singlelogin")
public class SingleLoginController {
private static final String BOUNDARY = "----WebKitFormBoundary7MA4YWxkTrZu0gW"; // 边界字符串(需唯一)
@Value("${url}")
private String url;
@ -62,6 +67,9 @@ public class SingleLoginController {
@Value("${enterpriseAppsecret}")
private String enterpriseAppsecret;
@Resource
private BasicInformationService basicInformationService;
/**
*
*/
@ -69,7 +77,7 @@ public class SingleLoginController {
@GetMapping("/login")
public void login(HttpServletResponse response) throws IOException {
//变成参数模式,appid 用于校验提交的来源地址,生产环境会校验,试用环境暂不校验
String scUrl = "clientUrl=" + URLEncoder.encode(returnUrl, "UTF-8") + "?appid=" + enterpriseAppId;
String scUrl = "clientUrl=" + URLEncoder.encode(returnUrl, "UTF-8") + "&appid=" + enterpriseAppId;
//加密后的客户端地址
scUrl = Base64.getEncoder().encodeToString(scUrl.getBytes());
//最终跳转地址
@ -89,44 +97,42 @@ public class SingleLoginController {
@ApiOperation(value = "获取用户信息", response = UserResponse.class)
@GetMapping("/getInfo")
public AjaxResult getInfo(String clientToken) throws Exception {
String url = infoUrl + "?clienttoken=" + clientToken;
HttpResponse response = HttpRequest.get(URLEncoder.encode(url, "UTF-8"))
HttpResponse response = HttpRequest.get(infoUrl)
.form("clienttoken", clientToken)
.addHeaders(generationHeader())
.execute();
System.out.println(url);
System.out.println("appid:"+enterpriseAppId);
System.out.println("time:"+generationHeader().get("time"));
System.out.println("sign:"+generationHeader().get("sign"));
System.out.println(response.body());
// String responseBody;
// 获取响应状态码
// int statusCode = response.getStatus();
// if (statusCode == 200) {
// // 获取响应内容
// responseBody = response.body();
// JSONObject jsonObj = JSONUtil.parseObj(responseBody);
// JSONObject dataObj = jsonObj.getJSONObject("data");
// //判断是法人用户
// if ("ep".equals(dataObj.get("usertype"))) {
// JSONObject mainobj = dataObj.getJSONObject("mainbody");
// UserResponse res = JSONUtil.toBean(dataObj, UserResponse.class);
// UserMainResponse req = JSONUtil.toBean(mainobj, UserMainResponse.class);
// String token = loginTokenService.singleLogin(req.getUscc(), req.getEpname(),
// "02", null, null);
// res.setToken(token);
// res.setMain(req);
// return AjaxResult.success(res);
// } else {
// log.error(response.body());
// throw new ServiceException("该用户不是企业法人");
// }
// } else {
// log.error(response.body());
// throw new ServiceException("未知异常请联系管理员");
// }
return null;
String responseBody;
int statusCode = response.getStatus();
if (statusCode == 200) {
// 获取响应内容
responseBody = response.body();
JSONObject jsonObj = JSONUtil.parseObj(responseBody);
JSONObject dataObj = jsonObj.getJSONObject("data");
//判断是法人用户
if ("ep".equals(dataObj.get("usertype"))) {
JSONObject mainobj = dataObj.getJSONObject("mainbody");
UserResponse res = JSONUtil.toBean(dataObj, UserResponse.class);
UserMainResponse req = JSONUtil.toBean(mainobj, UserMainResponse.class);
Long count = basicInformationService.lambdaQuery()
.eq(BasicInformation::getTyshxydm, req.getUscc())
.or()
.eq(BasicInformation::getXmfrdwxz, req.getEpname()).count();
if (count > 0) {
String token = loginTokenService.singleLogin(req.getUscc(), req.getEpname(),
"02", null, null);
res.setToken(token);
res.setMain(req);
return AjaxResult.success(res);
}else {
throw new ServiceException("贵公司无需参与苏州工业园区工业上楼相关填报工作。系统将即刻为您返回企业服务综合平台界面,以便您处理其他业务事宜!");
}
} else {
throw new ServiceException("该用户不是企业法人");
}
} else {
throw new ServiceException("未知异常请联系管理员");
}
}

@ -120,9 +120,9 @@ isZs: true
#企业端单点登陆url
url: https://qytt.sipac.gov.cn/api/usercenter/User/ssoLogin
#企业端用户信息url
infoUrl: http://172.21.14.70/api/usercenter/User/getInfo
infoUrl: https://qytt.sipac.gov.cn/api/usercenter/User/getInfo
#企业端退出登录url
logoutUrl: http://172.21.14.70/api/usercenter/User/ssoLogOut
logoutUrl: https://qytt.sipac.gov.cn/api/usercenter/User/ssoLogOut
#企业端正式环境应用系统编号
enterpriseAppId: 193d64ab-316e-11f0-b7ab-9c5c8e847e61
# 应用私钥

Loading…
Cancel
Save