From e62ac287bb9337b87977737c1cceca9e6793ce96 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 3 Apr 2023 23:56:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcJieci/controller/KcJieciController.java | 181 ++++++++++++++++++ .../modules/kc/kcJieci/entity/KcJieci.java | 56 ++++++ .../kc/kcJieci/mapper/KcJieciMapper.java | 17 ++ .../kc/kcJieci/mapper/xml/KcJieciMapper.xml | 5 + .../kc/kcJieci/service/IKcJieciService.java | 17 ++ .../service/impl/KcJieciServiceImpl.java | 95 +++++++++ .../controller/KcKetangbiaoController.java | 1 + .../modules/kc/ktgl/entity/KcKetangbiao.java | 2 + 8 files changed, 374 insertions(+) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/controller/KcJieciController.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/entity/KcJieci.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/mapper/KcJieciMapper.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/mapper/xml/KcJieciMapper.xml create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/IKcJieciService.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/controller/KcJieciController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/controller/KcJieciController.java new file mode 100644 index 00000000..2adf38a1 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/controller/KcJieciController.java @@ -0,0 +1,181 @@ +package org.jeecg.modules.kc.kcJieci.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +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.common.util.oConvertUtils; +import org.jeecg.modules.kc.kcJieci.entity.KcJieci; +import org.jeecg.modules.kc.kcJieci.service.IKcJieciService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +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: kc_jieci + * @Author: jeecg-boot + * @Date: 2023-04-03 + * @Version: V1.0 + */ +@Api(tags="kc_jieci") +@RestController +@RequestMapping("/kcJieci/kcJieci") +@Slf4j +public class KcJieciController extends JeecgController { + @Autowired + private IKcJieciService kcJieciService; + + /** + * 分页列表查询 + * + * @param kcJieci + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "kc_jieci-分页列表查询") + @ApiOperation(value="kc_jieci-分页列表查询", notes="kc_jieci-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(KcJieci kcJieci, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcJieci, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcJieciService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param kcJieci + * @return + */ + @AutoLog(value = "kc_jieci-添加") + @ApiOperation(value="kc_jieci-添加", notes="kc_jieci-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody KcJieci kcJieci) { + kcJieciService.save(kcJieci); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param kcJieci + * @return + */ + @AutoLog(value = "kc_jieci-编辑") + @ApiOperation(value="kc_jieci-编辑", notes="kc_jieci-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody KcJieci kcJieci) { + kcJieciService.updateById(kcJieci); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "kc_jieci-通过id删除") + @ApiOperation(value="kc_jieci-通过id删除", notes="kc_jieci-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + kcJieciService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "kc_jieci-批量删除") + @ApiOperation(value="kc_jieci-批量删除", notes="kc_jieci-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.kcJieciService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "kc_jieci-通过id查询") + @ApiOperation(value="kc_jieci-通过id查询", notes="kc_jieci-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + KcJieci kcJieci = kcJieciService.getById(id); + if(kcJieci==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(kcJieci); + } + + /** + * 导出excel + * + * @param request + * @param kcJieci + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, KcJieci kcJieci) { + return super.exportXls(request, kcJieci, KcJieci.class, "kc_jieci"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("kcJieci:kc_jieci:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, KcJieci.class); + } + + + @ApiOperation(value="kc_jieci-首页获取节次信息", notes="kc_jieci-首页获取节次信息") + @GetMapping(value = "/getIndexJcList") + public Result> getIndexJcList(KcJieci kcJieci) { + List pageList = kcJieciService.getIndexJcList(kcJieci); + return Result.OK(pageList); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/entity/KcJieci.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/entity/KcJieci.java new file mode 100644 index 00000000..48414539 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/entity/KcJieci.java @@ -0,0 +1,56 @@ +package org.jeecg.modules.kc.kcJieci.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.*; +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: kc_jieci + * @Author: jeecg-boot + * @Date: 2023-04-03 + * @Version: V1.0 + */ +@Data +@TableName("kc_jieci") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="kc_jieci对象", description="kc_jieci") +public class KcJieci implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Integer id; + /**节次*/ + @Excel(name = "节次", width = 15) + @ApiModelProperty(value = "节次") + private java.lang.String jieci; + /**节次开始时间*/ + @Excel(name = "节次开始时间", width = 15) + @ApiModelProperty(value = "节次开始时间") + private java.lang.String hhks; + /**节次结束时间*/ + @Excel(name = "节次结束时间", width = 15) + @ApiModelProperty(value = "节次结束时间") + private java.lang.String hhjs; + + @TableField(exist = false) + private String kssj; + + @TableField(exist = false) + private String type; + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/mapper/KcJieciMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/mapper/KcJieciMapper.java new file mode 100644 index 00000000..4b9e451a --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/mapper/KcJieciMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.kc.kcJieci.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.kc.kcJieci.entity.KcJieci; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: kc_jieci + * @Author: jeecg-boot + * @Date: 2023-04-03 + * @Version: V1.0 + */ +public interface KcJieciMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/mapper/xml/KcJieciMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/mapper/xml/KcJieciMapper.xml new file mode 100644 index 00000000..7a915dd1 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/mapper/xml/KcJieciMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/IKcJieciService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/IKcJieciService.java new file mode 100644 index 00000000..238651f6 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/IKcJieciService.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.kc.kcJieci.service; + +import org.jeecg.modules.kc.kcJieci.entity.KcJieci; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + * @Description: kc_jieci + * @Author: jeecg-boot + * @Date: 2023-04-03 + * @Version: V1.0 + */ +public interface IKcJieciService extends IService { + + List getIndexJcList(KcJieci kcJieci); +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java new file mode 100644 index 00000000..17a268b4 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java @@ -0,0 +1,95 @@ +package org.jeecg.modules.kc.kcJieci.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.jeecg.common.util.DateUtils; +import org.jeecg.modules.kc.kcJieci.entity.KcJieci; +import org.jeecg.modules.kc.kcJieci.mapper.KcJieciMapper; +import org.jeecg.modules.kc.kcJieci.service.IKcJieciService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +/** + * @Description: kc_jieci + * @Author: jeecg-boot + * @Date: 2023-04-03 + * @Version: V1.0 + */ +@Service +public class KcJieciServiceImpl extends ServiceImpl implements IKcJieciService { + + @Override + public List getIndexJcList(KcJieci kcJieci) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.apply("LENGTH(jieci)>2"); + queryWrapper.orderByAsc("id"); + List list = baseMapper.selectList(queryWrapper); + List resList = new ArrayList<>(); + String dqsj = DateUtils.getDate("HHmm");//获取当前时间的小时和分钟 + String minDate = list.get(0).getHhks();//最小开始时间 + String maxDate = list.get(5).getHhjs();//最大结束时间 + String dqkssj = "";//当前开始时间 + String dqjc = "";//当前节次 + String xyjkssj = "";//当前开始时间 + String xyjjc = "";//当前节次 + if(Integer.parseInt(dqsj)Integer.parseInt(maxDate)){ + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//设置格式 + Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例 + calendar.add(Calendar.DAY_OF_MONTH, +1); //当前时间减去一天，即一天前的时间 + //如果当前时间大于最后一节课则赋值给最后一节课 + dqkssj = DateUtils.getDate("yyyy-MM-dd"); + dqjc = list.get(5).getJieci(); + //下一节课赋值给明天第一节 + xyjkssj = simpleDateFormat.format(calendar.getTime()); + xyjjc = list.get(0).getJieci(); + }else{ + for(int i=0;i=Integer.parseInt(kssj)&&Integer.parseInt(dqsj) queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap()); queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')"); + queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs()); Page page = new Page(pageNo, pageSize); IPage pageList = kcKetangbiaoService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java index cfb08564..693a3d33 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java @@ -242,4 +242,6 @@ public class KcKetangbiao implements Serializable { @TableField(exist = false) private java.lang.String ywmc; + @TableField(exist = false) + private java.lang.String ywskxs; }