diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java similarity index 58% rename from adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaAllController.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index df371b67..1bbcd51a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -1,23 +1,22 @@ -package com.adc.da.sys.controller; +package com.adc.da.slrs.sarStandIdea.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; -import com.adc.da.sys.service.ISarPublicIdeaAllService; -import com.adc.da.sys.service.impl.SarPublicIdeaAllServiceImpl; +import com.adc.da.slrs.sarStandIdea.entity.DelStandDto; +import com.adc.da.slrs.sarStandIdea.entity.DetAllStandDto; +import com.adc.da.slrs.sarStandIdea.service.Impl.SarPublicIdeaAllServiceImpl; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.adc.da.sys.entity.SarPublicIdeaAll; +import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import javax.servlet.http.HttpServletResponse; -import java.util.List; /** *

@@ -29,40 +28,41 @@ import java.util.List; */ @RestController @Api(description = "|SarPublicIdeaAll|") -@RequestMapping("/${restPath}/sys/sar-public-idea-all") +@RequestMapping("/${restPath}/slrs/sar-public-idea-all") public class SarPublicIdeaAllController extends BaseController { @Autowired - private ISarPublicIdeaAllService iSarPublicIdeaAllService; + private SarPublicIdeaAllServiceImpl sarPublicIdeaAllImpl; @ApiOperation(value = "查询全部意见") - @GetMapping("/getallStand") - public ResponseMessage getAllStand( @RequestParam(defaultValue="1")Integer page, @RequestParam(defaultValue="10")Integer size,String cid){ - IPage Publiclist =iSarPublicIdeaAllService.SelectAll(page,size,cid); - return Result.success(Publiclist); + @GetMapping("/getAllStand") + public ResponseMessage getAllStand(DetAllStandDto detAllStandDto){ + IPage publicList =sarPublicIdeaAllImpl.selectAll(detAllStandDto); + return Result.success("200",publicList); } @ApiOperation(value = "增加意见") - @GetMapping("/inserdallStand") + @GetMapping("/insetStand") public ResponseMessage addAllStand(SarPublicIdeaAll sar){ - String src=iSarPublicIdeaAllService.add(sar); + String src=sarPublicIdeaAllImpl.add(sar); return Result.success("200",src); } @ApiOperation(value = "删除意见") @GetMapping("/deleteStand") - public ResponseMessage deleteStand(String id){ - String src=iSarPublicIdeaAllService.delete(id); + public ResponseMessage deleteStand(DelStandDto delStandDto){ + + String src=sarPublicIdeaAllImpl.delete(delStandDto); return Result.success("200",src); } @ApiOperation(value = "修改意见") @GetMapping("/updateStand") - public ResponseMessage updateStand(SarPublicIdeaAll sarPublicIdeaAll){ - String src=iSarPublicIdeaAllService.updaetById(sarPublicIdeaAll); + public ResponseMessage updateStand(SarPublicIdeaAll sarPublicIdeaAll,String autUserId){ + String src=sarPublicIdeaAllImpl.updateById(sarPublicIdeaAll,autUserId); return Result.success("200",src); } @@ -71,8 +71,8 @@ public class SarPublicIdeaAllController extends BaseController @ApiOperation(value = "导出全部意见") @GetMapping("/tuallStand") - public ResponseMessage getAllStand(HttpServletResponse response){ - String src=iSarPublicIdeaAllService.stuListExcel(response); + public ResponseMessage getAllStand(HttpServletResponse response,String cid){ + String src=sarPublicIdeaAllImpl.stuListExcel(response,cid); return Result.success("200",src); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java new file mode 100644 index 00000000..76cba33b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java @@ -0,0 +1,47 @@ +package com.adc.da.slrs.sarStandIdea.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandIdea.entity.SeByoDto; +import com.adc.da.slrs.sarStandIdea.service.Impl.SarPublicIdeaServiceImpl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdea; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 前端控制器 + *

+* +* @author super_liu +* @since 2021-06-02 +*/ +@RestController +@Api(description = "|SarPublicIdea|") +@RequestMapping("/${restPath}/slrs/sar-public-idea") +public class SarPublicIdeaController extends BaseController { + + @Autowired + private SarPublicIdeaServiceImpl sarPublicIdeaService; + + @ApiOperation(value = "分页查询") + @GetMapping("/SelectAllPage") + public ResponseMessage selectAllPage(@RequestParam(defaultValue="1")Integer page,@RequestParam(defaultValue="10")Integer size){ + IPage publicList =sarPublicIdeaService.selectAllP(page,size); + return Result.success(publicList); + } + + @ApiOperation(value = "动态查询") + @GetMapping("/SelectByo") + public ResponseMessage selectByDynamic(SeByoDto seByoDto){ + IPage publicList =sarPublicIdeaService.selectAllDynamic(seByoDto); + return Result.success(publicList); + } + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java similarity index 72% rename from adc-da-sys/src/main/java/com/adc/da/sys/dao/SarPublicIdeaAllDao.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java index f75ed3b7..8db66f76 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/SarPublicIdeaAllDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java @@ -1,11 +1,9 @@ -package com.adc.da.sys.dao; +package com.adc.da.slrs.sarStandIdea.dao; -import com.adc.da.sys.entity.SarPublicIdeaAll; +import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - /** *

* Mapper 接口 diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/SarPublicIdeaDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaDao.java similarity index 72% rename from adc-da-sys/src/main/java/com/adc/da/sys/dao/SarPublicIdeaDao.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaDao.java index 0e0bb84e..027b2e08 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/SarPublicIdeaDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaDao.java @@ -1,6 +1,7 @@ -package com.adc.da.sys.dao; +package com.adc.da.slrs.sarStandIdea.dao; -import com.adc.da.sys.entity.SarPublicIdea; + +import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdea; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DelStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DelStandDto.java new file mode 100644 index 00000000..4cc27d19 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DelStandDto.java @@ -0,0 +1,31 @@ +package com.adc.da.slrs.sarStandIdea.entity; + +public class DelStandDto { + private String id; + private String userId; + private String autUserId; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getAutUserId() { + return autUserId; + } + + public void setAutUserId(String autUserId) { + this.autUserId = autUserId; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java new file mode 100644 index 00000000..b579ec29 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java @@ -0,0 +1,40 @@ +package com.adc.da.slrs.sarStandIdea.entity; + +public class DetAllStandDto { + Integer page; + Integer size; + String cid; + String userId; + + public Integer getPage() { + return page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public Integer getSize() { + return size; + } + + public void setSize(Integer size) { + this.size = size; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getCid() { + return cid; + } + + public void setCid(String cid) { + this.cid = cid; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/SarPublicIdea.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java similarity index 75% rename from adc-da-sys/src/main/java/com/adc/da/sys/entity/SarPublicIdea.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java index df3ff480..e4774210 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/SarPublicIdea.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java @@ -1,4 +1,4 @@ -package com.adc.da.sys.entity; +package com.adc.da.slrs.sarStandIdea.entity; import com.adc.da.base.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; @@ -26,36 +26,36 @@ import org.springframework.format.annotation.DateTimeFormat; @Data @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) -@TableName("SAR_PUBLIC_IDEA") +@TableName("sar_public_idea") @ApiModel(value="SarPublicIdea对象", description="") public class SarPublicIdea extends BaseEntity { private static final long serialVersionUID = 1L; - @TableId("ID") + @TableId("id") private String id; - @TableField("CATEGORG") - private String categorg; + @TableField("category") + private String category; - @TableField("CID") + @TableField("cid") private String cid; - @TableField("CNAME") + @TableField("cname") private String cname; - @TableField("STARTTIME") + @TableField("start_time") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date starttime; + private Date startTime; - @TableField("ENDTIME") + @TableField("end_time") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date endtime; + private Date endTime; - @TableField("VALIG_FLAG") - private String valigFlag; + @TableField("category_flag") + private String categoryFlag; } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java similarity index 71% rename from adc-da-sys/src/main/java/com/adc/da/sys/entity/SarPublicIdeaAll.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java index d424de89..0189bf15 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/SarPublicIdeaAll.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java @@ -1,4 +1,4 @@ -package com.adc.da.sys.entity; +package com.adc.da.slrs.sarStandIdea.entity; import com.adc.da.base.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableId; @@ -21,27 +21,25 @@ import lombok.experimental.Accessors; @Data @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) -@TableName("SAR_PUBLIC_IDEA_ALL") +@TableName("sar_public_idea_all") @ApiModel(value="SarPublicIdeaAll对象", description="") public class SarPublicIdeaAll extends BaseEntity { @TableId private String id; - @TableField("CID") + @TableField("cid") private String cid; - @TableField("PART_CODE") + @TableField("part_code") private String partCode; - @TableField("COUNTENT") - private String countent; + @TableField("content") + private String content; - @TableField("DEPARTMENT") - private String department; - - @TableField("USER") - private String user; + @TableField("user_id") + private String userId; + public static final String CID = "cid"; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SeByoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SeByoDto.java new file mode 100644 index 00000000..48623687 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SeByoDto.java @@ -0,0 +1,59 @@ +package com.adc.da.slrs.sarStandIdea.entity; + + +public class SeByoDto { + Integer page; + Integer size; + String category; + String cname; + String startTime; + String endTime; + + public Integer getPage() { + return page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public Integer getSize() { + return size; + } + + public void setSize(Integer size) { + this.size = size; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getCname() { + return cname; + } + + public void setCname(String cname) { + this.cname = cname; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java new file mode 100644 index 00000000..c4120b68 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java @@ -0,0 +1,30 @@ +package com.adc.da.slrs.sarStandIdea.service; + + +import com.adc.da.slrs.sarStandIdea.entity.DelStandDto; +import com.adc.da.slrs.sarStandIdea.entity.DetAllStandDto; +import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletResponse; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-06-02 + */ +public interface ISarPublicIdeaAllService extends IService { + + + IPage selectAll(DetAllStandDto detAllStandDto); + String add(SarPublicIdeaAll sarPublicIdeaAll); + String updateById(SarPublicIdeaAll sarPublicIdeaAll, String autUseerid); + String delete(DelStandDto delStandDto); + String del(String id); + String stuListExcel(HttpServletResponse response,String cid); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java new file mode 100644 index 00000000..8eea2621 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.sarStandIdea.service; + + + +import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdea; +import com.adc.da.slrs.sarStandIdea.entity.SeByoDto; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-06-02 + */ +public interface ISarPublicIdeaService extends IService { + + String add(SarPublicIdea sarPublicIdea); + IPage selectAllP(Integer page, Integer size); + IPage selectAllDynamic(SeByoDto seByoDto); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java similarity index 72% rename from adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaAllServiceImpl.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java index 4247c760..6b6faa2d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java @@ -1,14 +1,19 @@ -package com.adc.da.sys.service.impl; +package com.adc.da.slrs.sarStandIdea.service.Impl; -import com.adc.da.sys.entity.SarPublicIdeaAll; -import com.adc.da.sys.dao.SarPublicIdeaAllDao; -import com.adc.da.sys.service.ISarPublicIdeaAllService; -import com.adc.da.util.UUIDUtils; + +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.IdUtil; +import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao; +import com.adc.da.slrs.sarStandIdea.entity.DelStandDto; +import com.adc.da.slrs.sarStandIdea.entity.DetAllStandDto; +import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; +import com.adc.da.slrs.sarStandIdea.service.ISarPublicIdeaAllService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; @@ -37,10 +42,10 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl SelectAll(Integer p,Integer size,String cid){ + public IPage selectAll(DetAllStandDto detAllStandDto){ QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("CID",cid); - Page page = new Page<>(p, size); + wrapper.eq("CID",detAllStandDto.getCid()); + Page page = new Page<>(detAllStandDto.getPage(),detAllStandDto.getSize()); IPage userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper); System.out.println("总条数"+userIPage.getTotal()); System.out.println("总页数"+userIPage.getPages()); @@ -49,36 +54,53 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl data=sarPublicIdeaAllDao.selectList(null); + public String stuListExcel(HttpServletResponse response,String cid) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(SarPublicIdeaAll.CID,cid); + List data=sarPublicIdeaAllDao.selectList(wrapper); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMdd hhmmss"); Workbook wb = new XSSFWorkbook(); //标题行抽出字段 - String[] title = {"", "标准或政策编号","章节编号", "内容", "提出部门", "提出人"}; + String[] title = {"", "标准或政策编号","章节编号", "内容","提出人"}; //设置sheet名称,并创建新的sheet对象 String sheetName = "意见信息一览"; Sheet stuSheet = wb.createSheet(sheetName); @@ -103,9 +125,8 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl + * 服务实现类 + *

+ * + * @author super_liu + * @since 2021-06-02 + */ +@Service("PublicIdeaStandEOService") +public class SarPublicIdeaServiceImpl extends ServiceImpl implements ISarPublicIdeaService { + + @Autowired + private SarPublicIdeaDao sarPublicIdeaDao; + + @Override + public String add(SarPublicIdea sarPublicIdea) { + if (!sarPublicIdea.getId().isEmpty()){ + sarPublicIdea.setId(UUIDUtils.randomUUID10()); + sarPublicIdeaDao.insert(sarPublicIdea); + return "增加成功"; + } + return "增加失败"; + } + + @Override + public IPage selectAllP(Integer p, Integer size) { + QueryWrapper wrapper = new QueryWrapper<>(); + Page page = new Page<>(p, size); + IPage userIPage = sarPublicIdeaDao.selectPage(page, wrapper); + System.out.println("总条数"+userIPage.getTotal()); + System.out.println("总页数"+userIPage.getPages()); + return userIPage; + } + + /** + * + * @param seByoDto + * @return + */ + @Override + public IPage selectAllDynamic(SeByoDto seByoDto) { + SarPublicIdea sar = new SarPublicIdea(); + sar.setCategory(seByoDto.getCategory()); + sar.setCname(seByoDto.getCname()); + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + try { + if (seByoDto.getStartTime()!=null){ + sar.setStartTime(formater.parse(seByoDto.getStartTime())); + } + if (seByoDto.getEndTime()!=null){ + sar.setEndTime(formater.parse(seByoDto.getEndTime())); + } + } catch (ParseException e) { + e.printStackTrace(); + } + QueryWrapper wrapper = new QueryWrapper<>(); + if (sar.getCategory()!=null&&sar.getCategory().length()!=0){ + wrapper.like("category",sar.getCategory()); + } + if (sar.getCname()!=null&&sar.getCname().length()!=0){ + wrapper.like("cname",sar.getCname()); + } + if (sar.getStartTime()!=null){ + wrapper.le("start_time",sar.getStartTime()); + } + if (sar.getEndTime()!=null){ + wrapper.gt("end_time",sar.getEndTime()); + } +// list.eq(StringUtils.isNotEmpty(sar.getCategory()),"category",sar.getCategory()) +// .like(StringUtils.isNotEmpty(sar.getCname()),"cname",sar.getCname()) +// .gt(sar.getStartTime()!=null,"start_time",sar.getStartTime()) +// .le(sar.getEndTime()!=null,"end_time",sar.getEndTime()); + + Page page = new Page<>(seByoDto.getPage(), seByoDto.getSize()); + IPage userIPage = sarPublicIdeaDao.selectPage(page, wrapper); + System.out.println("总条数"+userIPage.getTotal()); + System.out.println("总页数"+userIPage.getPages()); + return userIPage; + + + } +} diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml similarity index 67% rename from adc-da-sys/src/main/resources/mybatis/mapper/sys/SarPublicIdeaAllMapper.xml rename to adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 1c9e40c2..b0c8772d 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -1,4 +1,4 @@ - + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/SarPublicIdeaMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaMapper.xml similarity index 68% rename from adc-da-sys/src/main/resources/mybatis/mapper/sys/SarPublicIdeaMapper.xml rename to adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaMapper.xml index ef4754ef..20fd577b 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/SarPublicIdeaMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaController.java deleted file mode 100644 index 9a5e897b..00000000 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaController.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.adc.da.sys.controller; - - -import com.adc.da.http.ResponseMessage; -import com.adc.da.http.Result; -import com.adc.da.sys.entity.SarPublicIdeaAll; -import com.adc.da.sys.service.impl.SarPublicIdeaServiceImpl; -import com.adc.da.sys.util.DateUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.*; -import com.adc.da.sys.entity.SarPublicIdea; -import io.swagger.annotations.Api; -import com.adc.da.base.web.BaseController; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -/** -*

- * 前端控制器 - *

-* -* @author super_liu -* @since 2021-06-02 -*/ -@RestController -@Api(description = "|SarPublicIdea|") -@RequestMapping("/${restPath}/sys/sar-public-idea") -public class SarPublicIdeaController extends BaseController { - - @Autowired - private SarPublicIdeaServiceImpl sarPublicIdeaService; - - @ApiOperation(value = "分页查询") - @GetMapping("/SelectAllP") - public ResponseMessage SelectAllP(@RequestParam(defaultValue="1")Integer page,@RequestParam(defaultValue="10")Integer size,String categorg, String cname, - String start, String end){ - Date startdate = null; - Date enddate = null; - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - try { - if (start!=null){ - startdate = formater.parse(start); - } - if (end!=null){ - enddate=formater.parse(DateUtil.addOneDay(end)); - } - } catch (ParseException e) { - e.printStackTrace(); - } - IPage Publiclist =sarPublicIdeaService.SelectAllo(page,size,categorg,cname,startdate,enddate); - return Result.success(Publiclist); - } - - @ApiOperation(value = "模糊查询") - @GetMapping("/SelectByo") - public ResponseMessage SelectByo(@RequestParam(defaultValue="1")Integer page, @RequestParam(defaultValue="10")Integer size, String categorg, String cname, - String start, String end){ - Date startdate = null; - Date enddate = null; - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - try { - if (start!=null){ - startdate = formater.parse(start); - } - if (end!=null){ - enddate=formater.parse(end); - } - } catch (ParseException e) { - e.printStackTrace(); - } - - IPage Publiclist =sarPublicIdeaService.SelectAllo(page,size,categorg,cname,startdate,enddate); - return Result.success(Publiclist); - } - - -} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaAllService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaAllService.java deleted file mode 100644 index f45287c7..00000000 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaAllService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.adc.da.sys.service; - -import com.adc.da.sys.entity.SarPublicIdeaAll; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author super_liu - * @since 2021-06-02 - */ -public interface ISarPublicIdeaAllService extends IService { - - - IPage SelectAll(Integer page,Integer size,String cid); - String add(SarPublicIdeaAll sarPublicIdeaAll); - String delete(String id); - String updaetById(SarPublicIdeaAll sarPublicIdeaAll); - String stuListExcel(HttpServletResponse response); - -} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaService.java deleted file mode 100644 index 86d37a3d..00000000 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.adc.da.sys.service; - - -import com.adc.da.sys.entity.SarPublicIdea; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.Date; - -/** - *

- * 服务类 - *

- * - * @author super_liu - * @since 2021-06-02 - */ -public interface ISarPublicIdeaService extends IService { - - String add(SarPublicIdea sarPublicIdea); -// IPage SelectAllP(Integer page,Integer size); - IPage SelectAllo(Integer page, Integer size,String categorg,String cname,Date start,Date end); -} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaServiceImpl.java deleted file mode 100644 index f4c71604..00000000 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaServiceImpl.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.adc.da.sys.service.impl; - - -import com.adc.da.sys.entity.SarPublicIdea; -import com.adc.da.sys.dao.SarPublicIdeaDao; -import com.adc.da.sys.entity.SarPublicIdeaAll; -import com.adc.da.sys.service.ISarPublicIdeaService; -import com.adc.da.util.UUIDUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -/** - *

- * 服务实现类 - *

- * - * @author super_liu - * @since 2021-06-02 - */ -@Service("PublicIdeaStandEOService") -public class SarPublicIdeaServiceImpl extends ServiceImpl implements ISarPublicIdeaService { - - @Autowired - private SarPublicIdeaDao sarPublicIdeaDao; - - @Override - public String add(SarPublicIdea sarPublicIdea) { - if (!sarPublicIdea.getId().isEmpty()){ - sarPublicIdea.setId(UUIDUtils.randomUUID10()); - sarPublicIdeaDao.insert(sarPublicIdea); - return "增加成功"; - } - return "增加失败"; - } - -// @Override -// public IPage SelectAllP(Integer p, Integer size) { -// QueryWrapper wrapper = new QueryWrapper<>(); -// Page page = new Page<>(p, size); -// IPage userIPage = sarPublicIdeaDao.selectPage(page, wrapper); -// System.out.println("总条数"+userIPage.getTotal()); -// System.out.println("总页数"+userIPage.getPages()); -// return userIPage; -// } - - @Override - public IPage SelectAllo(Integer p, Integer size,String categorg,String cname,Date start,Date end) { - QueryWrapper list = new QueryWrapper<>(); - list.eq(StringUtils.isNotEmpty(categorg),"CATEGORG",categorg) - .like(StringUtils.isNotEmpty(cname),"CNAME",cname) - .gt(start!=null,"STARTTIME",start). - le(end!=null,"ENDTIME",end); - - -// list.eq(sarPublicIdea.getStarttiml()!=null,"STARTTIML",sarPublicIdea.getStarttiml()); -// list.eq(sarPublicIdea.getEndtime()!=null, "ENDTIME",sarPublicIdea.getEndtime()); -// list.like(StringUtils.isNoneEmpty(sarPublicIdea.getCname()), "CNAME", sarPublicIdea.getCname()); - Page page = new Page<>(p,size); - IPage userIPage = sarPublicIdeaDao.selectPage(page, list); - System.out.println("总条数"+userIPage.getTotal()); - System.out.println("总页数"+userIPage.getPages()); - return userIPage; - - - } - -}