|
@@ -3,6 +3,7 @@ package cn.ubitech.ttc.controller;
|
|
import cn.ubitech.ttc.common.ImageSpiderCommon;
|
|
import cn.ubitech.ttc.common.ImageSpiderCommon;
|
|
import cn.ubitech.ttc.common.Util;
|
|
import cn.ubitech.ttc.common.Util;
|
|
import cn.ubitech.ttc.entity.*;
|
|
import cn.ubitech.ttc.entity.*;
|
|
|
|
+import cn.ubitech.ttc.excel.entry.PolicyBasicInfoExcelData;
|
|
import cn.ubitech.ttc.model.common.*;
|
|
import cn.ubitech.ttc.model.common.*;
|
|
import cn.ubitech.ttc.model.datatools.dataentry.ConnectioninfoModel;
|
|
import cn.ubitech.ttc.model.datatools.dataentry.ConnectioninfoModel;
|
|
import cn.ubitech.ttc.model.export.InterviewExportParam;
|
|
import cn.ubitech.ttc.model.export.InterviewExportParam;
|
|
@@ -17,12 +18,15 @@ import cn.ubitech.ttc.service.impl.message.HomePageMessageService;
|
|
import cn.ubitech.ttc.service.impl.mybaits.*;
|
|
import cn.ubitech.ttc.service.impl.mybaits.*;
|
|
import cn.ubitech.ttc.service.impl.resource.ResourceServiceImpl;
|
|
import cn.ubitech.ttc.service.impl.resource.ResourceServiceImpl;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
|
|
+import com.google.gson.JsonArray;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import lombok.NonNull;
|
|
import lombok.NonNull;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
+import org.apache.commons.beanutils.BeanUtils;
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
@@ -959,8 +963,10 @@ public class DataToolsController {
|
|
@ApiImplicitParam(name = "innertype", paramType = "path", dataType = "int", value = "内部类型(通常用于单个表有多个属性)")
|
|
@ApiImplicitParam(name = "innertype", paramType = "path", dataType = "int", value = "内部类型(通常用于单个表有多个属性)")
|
|
})
|
|
})
|
|
public ResultModel getConnectioninfoAllDetail(@PathVariable long connid, @PathVariable Long userid,
|
|
public ResultModel getConnectioninfoAllDetail(@PathVariable long connid, @PathVariable Long userid,
|
|
- @PathVariable String node, @PathVariable Integer pagecode, @PathVariable Integer innertype) {
|
|
|
|
|
|
+ @PathVariable String node, @PathVariable Integer pagecode,
|
|
|
|
+ @PathVariable Integer innertype) {
|
|
ResultModel resultModel = new ResultModel();
|
|
ResultModel resultModel = new ResultModel();
|
|
|
|
+ log.info("connid:{},userid:{},node:{},pagecode:{}",connid,userid,node,pagecode);
|
|
try {
|
|
try {
|
|
resultModel.setData(interviewDataEntryService.getConnectioninfoAllDetail(connid, userid, node, pagecode, innertype));
|
|
resultModel.setData(interviewDataEntryService.getConnectioninfoAllDetail(connid, userid, node, pagecode, innertype));
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -1635,8 +1641,14 @@ public class DataToolsController {
|
|
@ApiImplicitParam(name = "requsetModel", value = "通用请求接口,date为Connectionotherinfo")
|
|
@ApiImplicitParam(name = "requsetModel", value = "通用请求接口,date为Connectionotherinfo")
|
|
})
|
|
})
|
|
public ResultModel saveOrUpdateOtherinfo(@RequestBody RequestModel requestModel) {
|
|
public ResultModel saveOrUpdateOtherinfo(@RequestBody RequestModel requestModel) {
|
|
|
|
+ log.info("走访 新建或者更新其他信息...");
|
|
|
|
+ log.info("走访 新建或者更新其他信息 requestModel***:" + JSON.toJSONString(requestModel));
|
|
ResultModel resultModel = new ResultModel();
|
|
ResultModel resultModel = new ResultModel();
|
|
try {
|
|
try {
|
|
|
|
+ // 前端传的是数组,此处需要改动。获取数组的第一个元素。
|
|
|
|
+ List<Connectionotherinfo> connectionotherinfos = JSONArray.parseArray
|
|
|
|
+ (JSONArray.toJSONString(requestModel.getData()), Connectionotherinfo.class);
|
|
|
|
+ requestModel.setData(connectionotherinfos.get(0));
|
|
Connectionotherinfo otherinfo = Util.fromJson(Util.toJson(requestModel.getData()), Connectionotherinfo.class);
|
|
Connectionotherinfo otherinfo = Util.fromJson(Util.toJson(requestModel.getData()), Connectionotherinfo.class);
|
|
requestModel.setData(interviewDataEntryService.insertOrUpdateOtherInfo(otherinfo));
|
|
requestModel.setData(interviewDataEntryService.insertOrUpdateOtherInfo(otherinfo));
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|