2023年7月27日 新增同步失败日志表

This commit is contained in:
bai 2023-07-27 00:26:03 +08:00
parent f61fea0dc8
commit 1d99621104
8 changed files with 397 additions and 1 deletions

View File

@ -1,5 +1,6 @@
package org.jeecg.modules.kc.grab.SynchronizationService;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
@ -11,8 +12,10 @@ import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj;
import org.jeecg.modules.kc.grab.imports.entity.XxhbbkjxtkpjBadLog;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbldxx;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
import org.jeecg.modules.kc.grab.imports.service.IXxhbbkjxtkpjBadLogService;
import org.jeecg.modules.kc.grab.imports.service.IXxhbbkjxtkpjService;
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
@ -70,6 +73,10 @@ public class SyncZwdtEvaluation extends BaseSync {
@Autowired
private ChangeTingKeTongJi changeTingKeTongJi;
@Autowired
private IXxhbbkjxtkpjBadLogService xxhbbkjxtkpjBadLogService;
Map<String,String> queOptionMap = Maps.newHashMap();
Map<String,String> ansOptionMap = Maps.newHashMap();
@ -232,6 +239,7 @@ public class SyncZwdtEvaluation extends BaseSync {
List<KcEvaluation> saveMainList = Lists.newArrayList();
List<KcEvaluations> saveChildList = Lists.newArrayList();
List<XxhbbkjxtkpjBadLog> saveXxhbbkjxtkpjBadLogList = Lists.newArrayList();
inDataList.forEach(x -> {
KcEvaluation main = new KcEvaluation();
@ -304,6 +312,11 @@ public class SyncZwdtEvaluation extends BaseSync {
if(ketangbiao == null) {
ketangbiao = new KcKetangbiao();
log.error("错误的课题");
//存新表里面
XxhbbkjxtkpjBadLog bedLog = BeanUtil.toBean(x, XxhbbkjxtkpjBadLog.class);
//bedLog.setTimestamps(DateUtil.format(x.getTimestamps(), DatePattern.NORM_DATETIME_PATTERN));
//outDataList.add(BeanUtil.toBean(x, XxhbbkjxtkpjBadLog.class));
saveXxhbbkjxtkpjBadLogList.add(bedLog);
}
main.setMinkcid(ketangbiao.getId());
@ -385,6 +398,10 @@ public class SyncZwdtEvaluation extends BaseSync {
});
//存错误日志
xxhbbkjxtkpjBadLogService.saveBatch(saveXxhbbkjxtkpjBadLogList);
//kcEvaluationService.saveBatch(saveMainList);
kcEvaluationsService.saveBatch(saveChildList);
// List<KcEvaluationque> saveList = Lists.newArrayList();

View File

@ -0,0 +1,163 @@
package org.jeecg.modules.kc.grab.imports.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.kc.grab.imports.entity.XxhbbkjxtkpjBadLog;
import org.jeecg.modules.kc.grab.imports.service.IXxhbbkjxtkpjBadLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
* @Description: 服务大厅同步失败记录
* @Author: jeecg-boot
* @Date: 2023-07-26
* @Version: V1.0
*/
@Api(tags="服务大厅同步失败记录")
@RestController
@RequestMapping("/grab/xxhbbkjxtkpjBadLog")
@Slf4j
public class XxhbbkjxtkpjBadLogController extends JeecgController<XxhbbkjxtkpjBadLog, IXxhbbkjxtkpjBadLogService> {
@Autowired
private IXxhbbkjxtkpjBadLogService xxhbbkjxtkpjBadLogService;
/**
* 分页列表查询
*
* @param xxhbbkjxtkpjBadLog
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "服务大厅同步失败记录-分页列表查询")
@ApiOperation(value="服务大厅同步失败记录-分页列表查询", notes="服务大厅同步失败记录-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<XxhbbkjxtkpjBadLog>> queryPageList(XxhbbkjxtkpjBadLog xxhbbkjxtkpjBadLog,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<XxhbbkjxtkpjBadLog> queryWrapper = QueryGenerator.initQueryWrapper(xxhbbkjxtkpjBadLog, req.getParameterMap());
Page<XxhbbkjxtkpjBadLog> page = new Page<XxhbbkjxtkpjBadLog>(pageNo, pageSize);
IPage<XxhbbkjxtkpjBadLog> pageList = xxhbbkjxtkpjBadLogService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param xxhbbkjxtkpjBadLog
* @return
*/
@AutoLog(value = "服务大厅同步失败记录-添加")
@ApiOperation(value="服务大厅同步失败记录-添加", notes="服务大厅同步失败记录-添加")
@RequiresPermissions("grab:xxhbbkjxtkpj_bad_log:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody XxhbbkjxtkpjBadLog xxhbbkjxtkpjBadLog) {
xxhbbkjxtkpjBadLogService.save(xxhbbkjxtkpjBadLog);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param xxhbbkjxtkpjBadLog
* @return
*/
@AutoLog(value = "服务大厅同步失败记录-编辑")
@ApiOperation(value="服务大厅同步失败记录-编辑", notes="服务大厅同步失败记录-编辑")
@RequiresPermissions("grab:xxhbbkjxtkpj_bad_log:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody XxhbbkjxtkpjBadLog xxhbbkjxtkpjBadLog) {
xxhbbkjxtkpjBadLogService.updateById(xxhbbkjxtkpjBadLog);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "服务大厅同步失败记录-通过id删除")
@ApiOperation(value="服务大厅同步失败记录-通过id删除", notes="服务大厅同步失败记录-通过id删除")
@RequiresPermissions("grab:xxhbbkjxtkpj_bad_log:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
xxhbbkjxtkpjBadLogService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "服务大厅同步失败记录-批量删除")
@ApiOperation(value="服务大厅同步失败记录-批量删除", notes="服务大厅同步失败记录-批量删除")
@RequiresPermissions("grab:xxhbbkjxtkpj_bad_log:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.xxhbbkjxtkpjBadLogService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "服务大厅同步失败记录-通过id查询")
@ApiOperation(value="服务大厅同步失败记录-通过id查询", notes="服务大厅同步失败记录-通过id查询")
@GetMapping(value = "/queryById")
public Result<XxhbbkjxtkpjBadLog> queryById(@RequestParam(name="id",required=true) String id) {
XxhbbkjxtkpjBadLog xxhbbkjxtkpjBadLog = xxhbbkjxtkpjBadLogService.getById(id);
if(xxhbbkjxtkpjBadLog==null) {
return Result.error("未找到对应数据");
}
return Result.OK(xxhbbkjxtkpjBadLog);
}
/**
* 导出excel
*
* @param request
* @param xxhbbkjxtkpjBadLog
*/
@RequiresPermissions("grab:xxhbbkjxtkpj_bad_log:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, XxhbbkjxtkpjBadLog xxhbbkjxtkpjBadLog) {
return super.exportXls(request, xxhbbkjxtkpjBadLog, XxhbbkjxtkpjBadLog.class, "服务大厅同步失败记录");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("grab:xxhbbkjxtkpj_bad_log:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, XxhbbkjxtkpjBadLog.class);
}
}

View File

@ -0,0 +1,164 @@
package org.jeecg.modules.kc.grab.imports.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 服务大厅同步失败记录
* @Author: jeecg-boot
* @Date: 2023-07-26
* @Version: V1.0
*/
@Data
@TableName("xxhbbkjxtkpj_bad_log")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="xxhbbkjxtkpj_bad_log对象", description="服务大厅同步失败记录")
public class XxhbbkjxtkpjBadLog implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
/**编号*/
@Excel(name = "编号", width = 15)
@ApiModelProperty(value = "编号")
private java.lang.String bh;
/**轮次编号*/
@Excel(name = "轮次编号", width = 15)
@ApiModelProperty(value = "轮次编号")
private java.lang.String lcbh;
/**轮次出镜人*/
@Excel(name = "轮次出镜人", width = 15)
@ApiModelProperty(value = "轮次出镜人")
private java.lang.String lccjr;
/**听课人工号*/
@Excel(name = "听课人工号", width = 15)
@ApiModelProperty(value = "听课人工号")
private java.lang.String tkrgh;
/**听课人姓名*/
@Excel(name = "听课人姓名", width = 15)
@ApiModelProperty(value = "听课人姓名")
private java.lang.String tkrxm;
/**听课人单位名称*/
@Excel(name = "听课人单位名称", width = 15)
@ApiModelProperty(value = "听课人单位名称")
private java.lang.String tkrdwmc;
/**听课时间学期*/
@Excel(name = "听课时间学期", width = 15)
@ApiModelProperty(value = "听课时间学期")
private java.lang.String tksjxq;
/**课程节次*/
@Excel(name = "课程节次", width = 15)
@ApiModelProperty(value = "课程节次")
private java.lang.String kcjc;
/**课程单位*/
@Excel(name = "课程单位", width = 15)
@ApiModelProperty(value = "课程单位")
private java.lang.String kcdm;
/**听课教师*/
@Excel(name = "听课教师", width = 15)
@ApiModelProperty(value = "听课教师")
private java.lang.String tkjs;
/**听课课程名称*/
@Excel(name = "听课课程名称", width = 15)
@ApiModelProperty(value = "听课课程名称")
private java.lang.String tkkcmc;
/**任课教师*/
@Excel(name = "任课教师", width = 15)
@ApiModelProperty(value = "任课教师")
private java.lang.String rkjs;
/**总体评价*/
@Excel(name = "总体评价", width = 15)
@ApiModelProperty(value = "总体评价")
private java.lang.String ztpj;
/**教师工号*/
@Excel(name = "教师工号", width = 15)
@ApiModelProperty(value = "教师工号")
private java.lang.String jsgh;
/**全体意见*/
@Excel(name = "全体意见", width = 15)
@ApiModelProperty(value = "全体意见")
private java.lang.String qtyj;
/**教师评估1*/
@Excel(name = "教师评估1", width = 15)
@ApiModelProperty(value = "教师评估1")
private java.lang.String jspg1;
/**教师评估2*/
@Excel(name = "教师评估2", width = 15)
@ApiModelProperty(value = "教师评估2")
private java.lang.String jspg2;
/**教师评估3*/
@Excel(name = "教师评估3", width = 15)
@ApiModelProperty(value = "教师评估3")
private java.lang.String jspg3;
/**教师评估4*/
@Excel(name = "教师评估4", width = 15)
@ApiModelProperty(value = "教师评估4")
private java.lang.String jspg4;
/**教师评估5*/
@Excel(name = "教师评估5", width = 15)
@ApiModelProperty(value = "教师评估5")
private java.lang.String jspg5;
/**学生评估1*/
@Excel(name = "学生评估1", width = 15)
@ApiModelProperty(value = "学生评估1")
private java.lang.String xspg1;
/**学生评估2*/
@Excel(name = "学生评估2", width = 15)
@ApiModelProperty(value = "学生评估2")
private java.lang.String xspg2;
/**学生评估3*/
@Excel(name = "学生评估3", width = 15)
@ApiModelProperty(value = "学生评估3")
private java.lang.String xspg3;
/**课程编号*/
@Excel(name = "课程编号", width = 15)
@ApiModelProperty(value = "课程编号")
private java.lang.String kcbh;
/**时间戳*/
@Excel(name = "时间戳", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "时间戳")
private java.util.Date timestamps;
/**课表编号*/
@Excel(name = "课表编号", width = 15)
@ApiModelProperty(value = "课表编号")
private java.lang.String kbbh;
}

View File

@ -0,0 +1,14 @@
package org.jeecg.modules.kc.grab.imports.mapper;
import org.jeecg.modules.kc.grab.imports.entity.XxhbbkjxtkpjBadLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 服务大厅同步失败记录
* @Author: jeecg-boot
* @Date: 2023-07-26
* @Version: V1.0
*/
public interface XxhbbkjxtkpjBadLogMapper extends BaseMapper<XxhbbkjxtkpjBadLog> {
}

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.kc.grab.imports.mapper.XxhbbkjxtkpjBadLogMapper">
</mapper>

View File

@ -0,0 +1,14 @@
package org.jeecg.modules.kc.grab.imports.service;
import org.jeecg.modules.kc.grab.imports.entity.XxhbbkjxtkpjBadLog;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 服务大厅同步失败记录
* @Author: jeecg-boot
* @Date: 2023-07-26
* @Version: V1.0
*/
public interface IXxhbbkjxtkpjBadLogService extends IService<XxhbbkjxtkpjBadLog> {
}

View File

@ -0,0 +1,19 @@
package org.jeecg.modules.kc.grab.imports.service.impl;
import org.jeecg.modules.kc.grab.imports.entity.XxhbbkjxtkpjBadLog;
import org.jeecg.modules.kc.grab.imports.mapper.XxhbbkjxtkpjBadLogMapper;
import org.jeecg.modules.kc.grab.imports.service.IXxhbbkjxtkpjBadLogService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 服务大厅同步失败记录
* @Author: jeecg-boot
* @Date: 2023-07-26
* @Version: V1.0
*/
@Service
public class XxhbbkjxtkpjBadLogServiceImpl extends ServiceImpl<XxhbbkjxtkpjBadLogMapper, XxhbbkjxtkpjBadLog> implements IXxhbbkjxtkpjBadLogService {
}

View File

@ -51,7 +51,7 @@ public interface KcKetangbiaoMapper extends BaseMapper<KcKetangbiao> {
List<KcKetangbiao> getKtbjList(KcKetangbiao kcKetangbiao);
IPage<KcKetangbiao> fundAllPjjgList(Page<KcKetangbiao> page, @Param(Constants.ENTITY) QueryWrapper<KcKetangbiao> queryWrapper);
IPage<KcKetangbiao> fundAllPjjgList(Page<KcKetangbiao> page, @Param(Constants.WRAPPER) QueryWrapper<KcKetangbiao> queryWrapper);
KcKetangbiao getScoreById(KcKetangbiao kcKetangbiao);