From b6fd093def92b3a538932c6cb808c94fa6275fa1 Mon Sep 17 00:00:00 2001 From: Jinquan_Ou <Jinquan@gdut.com> Date: 星期一, 27 三月 2023 22:01:29 +0800 Subject: [PATCH] 加上url --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZStayOutController.java | 117 +++++++ zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java | 1 zhang-content/src/main/java/com/ruoyi/service/ZExperienceService.java | 6 zhang-content/src/main/java/com/ruoyi/service/ZCertificateService.java | 6 zhang-content/src/main/java/com/ruoyi/service/ZAbroadService.java | 6 zhang-content/src/main/java/com/ruoyi/service/ZStayOutService.java | 3 zhang-content/src/main/java/com/ruoyi/service/impl/ZExperienceServiceImpl.java | 35 ++ zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 15 + zhang-content/src/main/java/com/ruoyi/domain/ZStayOut.java | 53 --- zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java | 68 +--- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAbroadController.java | 104 ++++++ ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZCertificateController.java | 106 ++++++ zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java | 73 +--- zhang-content/src/main/java/com/ruoyi/service/impl/ZStayOutServiceImpl.java | 11 zhang-content/src/main/java/com/ruoyi/domain/ZExperience.java | 70 +--- zhang-content/src/main/java/com/ruoyi/service/impl/ZCertificateServiceImpl.java | 33 ++ ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZExperienceController.java | 121 +++++++ zhang-content/src/main/java/com/ruoyi/service/impl/ZAbroadServiceImpl.java | 31 ++ 18 files changed, 643 insertions(+), 216 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAbroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAbroadController.java index c4c91be..8d95298 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAbroadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAbroadController.java @@ -1,9 +1,24 @@ package com.ruoyi.web.controller.zhang; -import org.springframework.web.bind.annotation.RequestMapping; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.domain.ZAbroad; +import com.ruoyi.service.ZAbroadService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; +import java.util.prefs.BackingStoreException; /** * <p> @@ -13,9 +28,92 @@ * @author ojq * @since 2023-03-14 */ +@Slf4j @RestController @RequestMapping("/zAbroad") -public class ZAbroadController { +public class ZAbroadController extends BaseController { + @Autowired + private ZAbroadService zAbroadService; + + @GetMapping("/all") + public AjaxResult listAll(){ + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + List<ZAbroad> zAbroads = zAbroadService.selectExperienceList(userId); + return AjaxResult.success(zAbroads); + } + + + /** + * 瀵煎嚭鍑哄浗(澧�)鎯呭喌璁板綍鍒楄〃 + */ +// @PreAuthorize("@ss.hasPermi('system:property:export')") + @Log(title = "鍑哄浗(澧�)鎯呭喌璁板綍", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ZAbroad zAbroad) + { + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + + List<ZAbroad> list = zAbroadService.selectExperienceList(userId); + log.info("瀵煎嚭璁板綍涓�:{}",list); + ExcelUtil<ZAbroad> util = new ExcelUtil<>(ZAbroad.class); + util.exportExcel(response, list, "鍑哄浗(澧�)鎯呭喌璁板綍鏁版嵁"); + } +// + + /** + * 瀵煎叆鍑哄浗(澧�)鎯呭喌璁板綍鍒楄〃 + */ + @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.IMPORT) + @PostMapping("/importData") + public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception + { + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + + boolean flag=zAbroadService.importExcel(file,userId); + if(flag){ + return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛"); + } + return AjaxResult.error("瀵煎叆鏁版嵁澶辫触"); + } + + /** + * 鏂板鍑哄浗(澧�)鎯呭喌璁板綍 + */ +// @PreAuthorize("@ss.hasPermi('system:property:add')") + @Log(title = "鍑哄浗(澧�)鎯呭喌璁板綍", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ZAbroad zAbroad) + { + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + zAbroad.setUserId(userId); + return toAjax(zAbroadService.save(zAbroad)); + } + + /** + * 淇敼鍑哄浗(澧�)鎯呭喌璁板綍 + */ +// @PreAuthorize("@ss.hasPermi('system:property:edit')") + @Log(title = "鍑哄浗(澧�)鎯呭喌璁板綍", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ZAbroad zAbroad) + { + return toAjax(zAbroadService.updateById(zAbroad)); + } +// + /** + * 鎵归噺鍒犻櫎鍑哄浗(澧�)鎯呭喌璁板綍 + */ +// @PreAuthorize("@ss.hasPermi('system:property:remove')") + @Log(title = "鍑哄浗(澧�)鎯呭喌璁板綍", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(zAbroadService.removeByIds(Arrays.asList(ids))); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZCertificateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZCertificateController.java index 8ba1b4a..d4dd1cc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZCertificateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZCertificateController.java @@ -1,9 +1,23 @@ package com.ruoyi.web.controller.zhang; -import org.springframework.web.bind.annotation.RequestMapping; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.domain.ZCertificate; +import com.ruoyi.service.ZCertificateService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** * <p> @@ -13,9 +27,95 @@ * @author ojq * @since 2023-03-14 */ +@Slf4j @RestController @RequestMapping("/zCertificate") -public class ZCertificateController { +public class ZCertificateController extends BaseController { + + @Autowired + private ZCertificateService zCertificateService; + + @GetMapping("/all") + public AjaxResult listAll(){ + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + List<ZCertificate> zCertificates = zCertificateService.selectExperienceList(userId); + return AjaxResult.success(zCertificates); + } + + + /** + * 瀵煎嚭鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐佃褰曞垪琛� + */ +// @PreAuthorize("@ss.hasPermi('system:property:export')") + @Log(title = "鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐佃褰�", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ZCertificate zCertificate) + { + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + + List<ZCertificate> list = zCertificateService.selectExperienceList(userId); + log.info("瀵煎嚭璁板綍涓�:{}",list); + ExcelUtil<ZCertificate> util = new ExcelUtil<>(ZCertificate.class); + util.exportExcel(response, list, "鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐佃褰曟暟鎹�"); + } +// + + /** + * 瀵煎叆鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐佃褰曞垪琛� + */ + @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.IMPORT) + @PostMapping("/importData") + public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception + { + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + + boolean flag=zCertificateService.importExcel(file,userId); + if(flag){ + return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛"); + } + return AjaxResult.error("瀵煎叆鏁版嵁澶辫触"); + } + + + + /** + * 鏂板鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐佃褰� + */ +// @PreAuthorize("@ss.hasPermi('system:property:add')") + @Log(title = "鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐佃褰�", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ZCertificate zCertificate) + { + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + zCertificate.setUserId(userId); + return toAjax(zCertificateService.save(zCertificate)); + } + + /** + * 淇敼鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐佃褰� + */ +// @PreAuthorize("@ss.hasPermi('system:property:edit')") + @Log(title = "鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐佃褰�", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ZCertificate zCertificate) + { + return toAjax(zCertificateService.updateById(zCertificate)); + } +// + /** + * 鎵归噺鍒犻櫎鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐佃褰� + */ +// @PreAuthorize("@ss.hasPermi('system:property:remove')") + @Log(title = "鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐佃褰�", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(zCertificateService.removeByIds(Arrays.asList(ids))); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZExperienceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZExperienceController.java index 5492307..0117388 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZExperienceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZExperienceController.java @@ -1,9 +1,29 @@ package com.ruoyi.web.controller.zhang; -import org.springframework.web.bind.annotation.RequestMapping; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.domain.ZExperience; +import com.ruoyi.service.ZExperienceService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM; +import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE; /** * <p> @@ -13,9 +33,104 @@ * @author ojq * @since 2023-03-14 */ +@Slf4j @RestController @RequestMapping("/zExperience") -public class ZExperienceController { +public class ZExperienceController extends BaseController { + + @Autowired + private ZExperienceService zExperienceService; + + @GetMapping("/all") + public AjaxResult listAll(){ + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + List<ZExperience> zExperiences = zExperienceService.selectExperienceList(userId); + return AjaxResult.success(zExperiences); + } + + + /** + * 瀵煎嚭涓汉涓昏瀛︿範宸ヤ綔缁忓巻璁板綍鍒楄〃 + */ +// @PreAuthorize("@ss.hasPermi('system:property:export')") + @Log(title = "涓汉涓昏瀛︿範宸ヤ綔缁忓巻璁板綍", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ZExperience zExperience) + { + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + + List<ZExperience> list = zExperienceService.selectExperienceList(userId); + log.info("瀵煎嚭璁板綍涓�:{}",list); + ExcelUtil<ZExperience> util = new ExcelUtil<>(ZExperience.class); + util.exportExcel(response, list, "涓汉涓昏瀛︿範宸ヤ綔缁忓巻璁板綍鏁版嵁"); + } +// + + /** + * 瀵煎叆涓汉涓昏瀛︿範宸ヤ綔缁忓巻璁板綍鍒楄〃 + */ + @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.IMPORT) + @PostMapping("/importData") + public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception + { + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + + boolean flag=zExperienceService.importExcel(file,userId); + if(flag){ + return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛"); + } + return AjaxResult.error("瀵煎叆鏁版嵁澶辫触"); + } + + +// /** +// * 鑾峰彇涓汉涓昏瀛︿範宸ヤ綔缁忓巻璁板綍璇︾粏淇℃伅 +// */ +//// @PreAuthorize("@ss.hasPermi('system:property:query')") +// @GetMapping(value = "/{id}") +// public AjaxResult getInfo(@PathVariable("id") Long id) +// { +// return success(zExperienceService.getById(id)); +// } +// + /** + * 鏂板涓汉涓昏瀛︿範宸ヤ綔缁忓巻璁板綍 + */ +// @PreAuthorize("@ss.hasPermi('system:property:add')") + @Log(title = "涓汉涓昏瀛︿範宸ヤ綔缁忓巻璁板綍", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ZExperience zExperience) + { + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + zExperience.setUserId(userId); + return toAjax(zExperienceService.save(zExperience)); + } + + /** + * 淇敼涓汉涓昏瀛︿範宸ヤ綔缁忓巻璁板綍 + */ +// @PreAuthorize("@ss.hasPermi('system:property:edit')") + @Log(title = "涓汉涓昏瀛︿範宸ヤ綔缁忓巻璁板綍", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ZExperience zExperience) + { + return toAjax(zExperienceService.updateById(zExperience)); + } +// + /** + * 鎵归噺鍒犻櫎涓汉涓昏瀛︿範宸ヤ綔缁忓巻璁板綍 + */ +// @PreAuthorize("@ss.hasPermi('system:property:remove')") + @Log(title = "涓汉涓昏瀛︿範宸ヤ綔缁忓巻璁板綍", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(zExperienceService.removeByIds(Arrays.asList(ids))); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZStayOutController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZStayOutController.java index 7e8aaea..f2ace1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZStayOutController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZStayOutController.java @@ -1,9 +1,25 @@ package com.ruoyi.web.controller.zhang; -import org.springframework.web.bind.annotation.RequestMapping; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.domain.ZStayOut; +import com.ruoyi.domain.ZStayOut; +import com.ruoyi.service.ZStayOutService; +import com.ruoyi.service.ZStayOutService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** * <p> @@ -13,9 +29,104 @@ * @author ojq * @since 2023-03-14 */ +@Slf4j @RestController @RequestMapping("/zStayOut") -public class ZStayOutController { +public class ZStayOutController extends BaseController { + + @Autowired + private ZStayOutService zStayOutService; + + @GetMapping("/all") + public AjaxResult listAll(){ + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + List<ZStayOut> zStayOuts = zStayOutService.selectStayOutList(userId); + return AjaxResult.success(zStayOuts); + } + + +// /** +// * 瀵煎嚭绉诲眳鍥�(澧�)鎯呭喌璁板綍鍒楄〃 +// */ +//// @PreAuthorize("@ss.hasPermi('system:property:export')") +// @Log(title = "绉诲眳鍥�(澧�)鎯呭喌璁板綍", businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// public void export(HttpServletResponse response, ZStayOut zStayOut) +// { +// SysUser user = SecurityUtils.getLoginUser().getUser(); +// Long userId = user.getUserId(); +// +// List<ZStayOut> list = zStayOutService.selectExperienceList(userId); +// log.info("瀵煎嚭璁板綍涓�:{}",list); +// ExcelUtil<ZStayOut> util = new ExcelUtil<>(ZStayOut.class); +// util.exportExcel(response, list, "绉诲眳鍥�(澧�)鎯呭喌璁板綍鏁版嵁"); +// } +// + +// /** +// * 瀵煎叆绉诲眳鍥�(澧�)鎯呭喌璁板綍鍒楄〃 +// */ +// @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.IMPORT) +// @PostMapping("/importData") +// public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception +// { +// SysUser user = SecurityUtils.getLoginUser().getUser(); +// Long userId = user.getUserId(); +// +// boolean flag=zStayOutService.importExcel(file,userId); +// if(flag){ +// return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛"); +// } +// return AjaxResult.error("瀵煎叆鏁版嵁澶辫触"); +// } + + +// /** +// * 鑾峰彇绉诲眳鍥�(澧�)鎯呭喌璁板綍璇︾粏淇℃伅 +// */ +//// @PreAuthorize("@ss.hasPermi('system:property:query')") +// @GetMapping(value = "/{id}") +// public AjaxResult getInfo(@PathVariable("id") Long id) +// { +// return success(zStayOutService.getById(id)); +// } +// + /** + * 鏂板鎴栦慨鏀圭Щ灞呭浗(澧�)鎯呭喌璁板綍 + */ +// @PreAuthorize("@ss.hasPermi('system:property:add')") + @Log(title = "绉诲眳鍥�(澧�)鎯呭喌璁板綍", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ZStayOut zStayOut) + { + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + zStayOut.setUserId(userId); + return toAjax(zStayOutService.saveOrUpdate(zStayOut)); + } + +// /** +// * 淇敼绉诲眳鍥�(澧�)鎯呭喌璁板綍 +// */ +//// @PreAuthorize("@ss.hasPermi('system:property:edit')") +// @Log(title = "绉诲眳鍥�(澧�)鎯呭喌璁板綍", businessType = BusinessType.UPDATE) +// @PutMapping +// public AjaxResult edit(@RequestBody ZStayOut zStayOut) +// { +// return toAjax(zStayOutService.updateById(zStayOut)); +// } +// +// /** +// * 鎵归噺鍒犻櫎绉诲眳鍥�(澧�)鎯呭喌璁板綍 +// */ +//// @PreAuthorize("@ss.hasPermi('system:property:remove')") +// @Log(title = "绉诲眳鍥�(澧�)鎯呭喌璁板綍", businessType = BusinessType.DELETE) +// @DeleteMapping("/{ids}") +// public AjaxResult remove(@PathVariable Long[] ids) +// { +// return toAjax(zStayOutService.removeByIds(Arrays.asList(ids))); +// } } diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java b/zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java index 21c0796..2f908e6 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java @@ -3,8 +3,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; +import lombok.ToString; + import java.io.Serializable; import java.time.LocalDateTime; +import java.util.Date; /** * <p> @@ -14,83 +20,39 @@ * @author ojq * @since 2023-03-14 */ +@Data +@ToString @TableName("z_abroad") public class ZAbroad implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 鐢ㄦ埛id */ - private Integer userId; + private Long userId; /** * 鐩殑鍦� */ + @Excel(name="鐩殑鍦�") private String destination; /** * 鍒扮洰鐨勫湴浜嬬敱 */ + @Excel(name="鍒扮洰鐨勫湴鏄敱") private String cause; /** * 璧峰鏃ユ湡 */ - private LocalDateTime startDate; + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name="璧峰鏃ユ湡",dateFormat = "yyyy-MM-dd") + private Date startDate; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public String getDestination() { - return destination; - } - - public void setDestination(String destination) { - this.destination = destination; - } - - public String getCause() { - return cause; - } - - public void setCause(String cause) { - this.cause = cause; - } - - public LocalDateTime getStartDate() { - return startDate; - } - - public void setStartDate(LocalDateTime startDate) { - this.startDate = startDate; - } - - @Override - public String toString() { - return "ZAbroad{" + - "id=" + id + - ", userId=" + userId + - ", destination=" + destination + - ", cause=" + cause + - ", startDate=" + startDate + - "}"; - } } diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java b/zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java index aea9ba8..9110dc1 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java @@ -3,8 +3,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; +import lombok.ToString; + import java.io.Serializable; import java.time.LocalDateTime; +import java.util.Date; /** * <p> @@ -14,83 +20,46 @@ * @author ojq * @since 2023-03-14 */ +@Data +@ToString @TableName("z_certificate") public class ZCertificate implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 鐢ㄦ埛id */ - private Integer userId; + private Long userId; /** * 璇佷欢鍚嶇О */ + @Excel(name = "璇佷欢鍚嶇О") private String cerName; /** * 璇佷欢鍙风爜 */ + @Excel(name="璇佷欢鍙风爜") private String idNo; /** * 鏈夋晥鏈� */ - private LocalDateTime validityDate; + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name="璇佷欢鏈夋晥鏈熻嚦",dateFormat = "yyyy-MM-dd") + private Date validityDate; + + /** + * 鎸佹湁鎯呭喌 + */ + @Excel(name = "鎸佹湁鎯呭喌") + private String ownStatus; - public Integer getId() { - return id; - } - public void setId(Integer id) { - this.id = id; - } - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public String getCerName() { - return cerName; - } - - public void setCerName(String cerName) { - this.cerName = cerName; - } - - public String getIdNo() { - return idNo; - } - - public void setIdNo(String idNo) { - this.idNo = idNo; - } - - public LocalDateTime getValidityDate() { - return validityDate; - } - - public void setValidityDate(LocalDateTime validityDate) { - this.validityDate = validityDate; - } - - @Override - public String toString() { - return "ZCertificate{" + - "id=" + id + - ", userId=" + userId + - ", cerName=" + cerName + - ", idNo=" + idNo + - ", validityDate=" + validityDate + - "}"; - } } diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZExperience.java b/zhang-content/src/main/java/com/ruoyi/domain/ZExperience.java index 458954c..3ea8652 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZExperience.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZExperience.java @@ -3,8 +3,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; +import lombok.ToString; + import java.io.Serializable; import java.time.LocalDateTime; +import java.util.Date; /** * <p> @@ -14,83 +20,41 @@ * @author ojq * @since 2023-03-14 */ + +@Data +@ToString @TableName("z_experience") public class ZExperience implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 鐢ㄦ埛id */ - private Integer userId; + private Long userId; /** * 涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌 */ + + @Excel(name = "涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌") private String content; /** * 璧峰鏃ユ湡 */ - private LocalDateTime startDate; + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "璧峰鏃ユ湡", dateFormat = "yyyy-MM-dd") + private Date startDate; /** * 璇佹槑浜哄悕瀛� */ + @Excel(name = "璇佹槑浜哄悕瀛�") private String witness; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public LocalDateTime getStartDate() { - return startDate; - } - - public void setStartDate(LocalDateTime startDate) { - this.startDate = startDate; - } - - public String getWitness() { - return witness; - } - - public void setWitness(String witness) { - this.witness = witness; - } - - @Override - public String toString() { - return "ZExperience{" + - "id=" + id + - ", userId=" + userId + - ", content=" + content + - ", startDate=" + startDate + - ", witness=" + witness + - "}"; - } } diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java index 10d5efb..62434f5 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java @@ -118,6 +118,18 @@ private String position; /** + * 鎷ユ湁澶栫睄銆佸澶栨案涔呭眳鐣欐潈鎴栬�呴暱鏈熷眳鐣欒鍙殑鎯呭喌,1锛氭湁銆�0锛氭病鏈� + */ + @Excel(name="鎷ユ湁澶栫睄銆佸澶栨案涔呭眳鐣欐潈鎴栬�呴暱鏈熷眳鐣欒鍙殑鎯呭喌",readConverterExp = "0=娌℃湁,1=鏈�") + private Integer outStatus; + + /** + * 澶栫睄銆佸澶栫浉鍏宠瘉浠跺彿鐮� + */ + @Excel(name = "澶栫睄銆佸澶栫浉鍏宠瘉浠跺彿鐮�") + private String idNo; + + /** * 鍥剧墖鍦板潃 */ private String img; @@ -144,4 +156,7 @@ */ private String url; + + + } diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZStayOut.java b/zhang-content/src/main/java/com/ruoyi/domain/ZStayOut.java index cc450de..ab438ce 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZStayOut.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZStayOut.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** @@ -13,69 +15,28 @@ * @author ojq * @since 2023-03-14 */ +@Data @TableName("z_stay_out") public class ZStayOut implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 鐢ㄦ埛id */ - private Integer userId; + private Long userId; /** - * 鎷ユ湁澶栫睄銆佸澶栨案涔呭眳鐣欐潈鎴栬�呴暱鏈熷眳鐣欒鍙殑鎯呭喌 + * 鎷ユ湁澶栫睄銆佸澶栨案涔呭眳鐣欐潈鎴栬�呴暱鏈熷眳鐣欒鍙殑鎯呭喌,1锛氭湁銆�0锛氭病鏈� */ - private String content; + private Integer content; /** * 璇佷欢鍙风爜 */ private String idNo; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public String getIdNo() { - return idNo; - } - - public void setIdNo(String idNo) { - this.idNo = idNo; - } - - @Override - public String toString() { - return "ZStayOut{" + - "id=" + id + - ", userId=" + userId + - ", content=" + content + - ", idNo=" + idNo + - "}"; - } } diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java index 17c1b2d..5b16301 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java @@ -61,5 +61,6 @@ @Excel(name="澶囨敞淇℃伅") private String remark; + private String url; } diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZAbroadService.java b/zhang-content/src/main/java/com/ruoyi/service/ZAbroadService.java index ef83b16..0084d6b 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/ZAbroadService.java +++ b/zhang-content/src/main/java/com/ruoyi/service/ZAbroadService.java @@ -3,6 +3,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.domain.ZAbroad; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; /** * <p> @@ -14,4 +17,7 @@ */ public interface ZAbroadService extends IService<ZAbroad> { + List<ZAbroad> selectExperienceList(Long userId); + + boolean importExcel(MultipartFile file, Long userId); } diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZCertificateService.java b/zhang-content/src/main/java/com/ruoyi/service/ZCertificateService.java index 35a0d5f..b181049 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/ZCertificateService.java +++ b/zhang-content/src/main/java/com/ruoyi/service/ZCertificateService.java @@ -3,6 +3,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.domain.ZCertificate; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; /** * <p> @@ -14,4 +17,7 @@ */ public interface ZCertificateService extends IService<ZCertificate> { + List<ZCertificate> selectExperienceList(Long userId); + + boolean importExcel(MultipartFile file, Long userId); } diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZExperienceService.java b/zhang-content/src/main/java/com/ruoyi/service/ZExperienceService.java index d563292..55e9ba2 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/ZExperienceService.java +++ b/zhang-content/src/main/java/com/ruoyi/service/ZExperienceService.java @@ -3,6 +3,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.domain.ZExperience; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; /** * <p> @@ -14,4 +17,7 @@ */ public interface ZExperienceService extends IService<ZExperience> { + List<ZExperience> selectExperienceList(Long userId); + + boolean importExcel(MultipartFile file, Long userId); } diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZStayOutService.java b/zhang-content/src/main/java/com/ruoyi/service/ZStayOutService.java index e729163..fb794ed 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/ZStayOutService.java +++ b/zhang-content/src/main/java/com/ruoyi/service/ZStayOutService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.domain.ZStayOut; +import java.util.List; + /** * <p> * 鏈嶅姟绫� @@ -14,4 +16,5 @@ */ public interface ZStayOutService extends IService<ZStayOut> { + List<ZStayOut> selectStayOutList(Long userId); } diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZAbroadServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZAbroadServiceImpl.java index f3a5372..d9ea16d 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZAbroadServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZAbroadServiceImpl.java @@ -1,11 +1,18 @@ package com.ruoyi.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZAbroad; import com.ruoyi.mapper.ZAbroadMapper; import com.ruoyi.service.ZAbroadService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.stream.Collectors; /** * <p> @@ -15,7 +22,31 @@ * @author ojq * @since 2023-03-14 */ +@Slf4j @Service public class ZAbroadServiceImpl extends ServiceImpl<ZAbroadMapper, ZAbroad> implements ZAbroadService { + @Override + public List<ZAbroad> selectExperienceList(Long userId) { + LambdaQueryWrapper<ZAbroad> lqw = new LambdaQueryWrapper<>(); + lqw.eq(ZAbroad::getUserId,userId); + return list(lqw); + } + + @Override + public boolean importExcel(MultipartFile file, Long userId) { + ExcelUtil<ZAbroad> util = new ExcelUtil<>(ZAbroad.class); + List<ZAbroad> abroadList = null; + try { + abroadList = util.importExcel(file.getInputStream()); + } catch (Exception e) { + e.printStackTrace(); + } + assert abroadList != null; + List<ZAbroad> list = abroadList.stream().peek( + (abroad) -> abroad.setUserId(userId) + ).collect(Collectors.toList()); + log.info("璧勪骇鍒楄〃涓猴細{}",list); + return saveBatch(list); + } } diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZCertificateServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZCertificateServiceImpl.java index a05b129..a739542 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZCertificateServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZCertificateServiceImpl.java @@ -1,11 +1,19 @@ package com.ruoyi.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZCertificate; +import com.ruoyi.domain.ZExperience; import com.ruoyi.mapper.ZCertificateMapper; import com.ruoyi.service.ZCertificateService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.stream.Collectors; /** * <p> @@ -15,7 +23,32 @@ * @author ojq * @since 2023-03-14 */ +@Slf4j @Service public class ZCertificateServiceImpl extends ServiceImpl<ZCertificateMapper, ZCertificate> implements ZCertificateService { + @Override + public List<ZCertificate> selectExperienceList(Long userId) { + LambdaQueryWrapper<ZCertificate> lqw = new LambdaQueryWrapper<>(); + lqw.eq(ZCertificate::getUserId,userId); + return list(lqw); + } + + @Override + public boolean importExcel(MultipartFile file, Long userId) { + ExcelUtil<ZCertificate> util = new ExcelUtil<>(ZCertificate.class); + List<ZCertificate> certificateList = null; + try { + certificateList = util.importExcel(file.getInputStream()); + } catch (Exception e) { + e.printStackTrace(); + } + assert certificateList != null; + List<ZCertificate> list = certificateList.stream().peek( + (certificate) -> certificate.setUserId(userId) + ).collect(Collectors.toList()); + log.info("璧勪骇鍒楄〃涓猴細{}",list); + return saveBatch(list); + } + } diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZExperienceServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZExperienceServiceImpl.java index 9bb4412..bac2b39 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZExperienceServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZExperienceServiceImpl.java @@ -1,11 +1,19 @@ package com.ruoyi.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZExperience; import com.ruoyi.mapper.ZExperienceMapper; import com.ruoyi.service.ZExperienceService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.stream.Collectors; /** * <p> @@ -15,7 +23,34 @@ * @author ojq * @since 2023-03-14 */ +@Slf4j @Service public class ZExperienceServiceImpl extends ServiceImpl<ZExperienceMapper, ZExperience> implements ZExperienceService { + @Override + public List<ZExperience> selectExperienceList(Long userId) { + + LambdaQueryWrapper<ZExperience> lqw = new LambdaQueryWrapper<>(); + lqw.eq(ZExperience::getUserId,userId); + return list(lqw); + + + } + + @Override + public boolean importExcel(MultipartFile file, Long userId) { + ExcelUtil<ZExperience> util = new ExcelUtil<>(ZExperience.class); + List<ZExperience> propertyList = null; + try { + propertyList = util.importExcel(file.getInputStream()); + } catch (Exception e) { + e.printStackTrace(); + } + assert propertyList != null; + List<ZExperience> list = propertyList.stream().peek( + (property) -> property.setUserId(userId) + ).collect(Collectors.toList()); + log.info("璧勪骇鍒楄〃涓猴細{}",list); + return saveBatch(list); + } } diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZStayOutServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZStayOutServiceImpl.java index 0dc668d..a755a5e 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZStayOutServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZStayOutServiceImpl.java @@ -1,11 +1,14 @@ package com.ruoyi.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.domain.ZStayOut; import com.ruoyi.mapper.ZStayOutMapper; import com.ruoyi.service.ZStayOutService; import org.springframework.stereotype.Service; + +import java.util.List; /** * <p> @@ -18,4 +21,12 @@ @Service public class ZStayOutServiceImpl extends ServiceImpl<ZStayOutMapper, ZStayOut> implements ZStayOutService { + @Override + public List<ZStayOut> selectStayOutList(Long userId) { + + LambdaQueryWrapper<ZStayOut> lqw = new LambdaQueryWrapper<>(); + lqw.eq(ZStayOut::getUserId,userId); + return list(lqw); + + } } -- Gitblit v1.9.1