diff --git a/box-bps/pom.xml b/box-bps/pom.xml new file mode 100644 index 000000000..729e8ff11 --- /dev/null +++ b/box-bps/pom.xml @@ -0,0 +1,47 @@ + + + + ruoyi + com.ruoyi + 4.6.1 + + 4.0.0 + + box-bps + + + bps系统模块 + + + + + + + com.ruoyi + ruoyi-common + + + + org.json + json + 20160810 + + + + io.swagger + swagger-annotations + 1.5.21 + compile + + + + com.github.kuaidi100-api + sdk + 1.0.2 + + + + + \ No newline at end of file diff --git a/box-bps/src/main/java/com/ruoyi/bps/controller/ExpSubsPushApiController.java b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpSubsPushApiController.java new file mode 100644 index 000000000..02e7cc63e --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpSubsPushApiController.java @@ -0,0 +1,46 @@ +package com.ruoyi.bps.controller; + +import com.kuaidi100.sdk.response.SubscribeResp; +import com.ruoyi.bps.domain.ExpSubscribe; +import com.ruoyi.bps.service.IExpSubsPushApiService; +import com.ruoyi.common.core.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; + +/** + * 接受快递推送信息的API接口Controller + * + * @author box + * @date 2021-05-13 + */ +@Api("快递信息订阅推送") +@RestController +@RequestMapping("/anon") +public class ExpSubsPushApiController extends BaseController { + @Autowired + IExpSubsPushApiService expSubsPushApiService; + + //推送 + @CrossOrigin + @PostMapping("/subscribeCallBackUrl") + @ApiOperation("快递信息订阅推送接受") + public SubscribeResp SubscribeCallBackUrl(HttpServletRequest request) { + return expSubsPushApiService.ExpressSubscribeCallBackUrl(request); + } + + //订阅 + @CrossOrigin + @PostMapping("/subscribe") + public SubscribeResp Subscribe(ExpSubscribe expSubscribe){ + return expSubsPushApiService.ExpressSubscribe(expSubscribe); + } + +} + diff --git a/box-bps/src/main/java/com/ruoyi/bps/controller/ExpSubsPushRespController.java b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpSubsPushRespController.java new file mode 100644 index 000000000..3b8792816 --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpSubsPushRespController.java @@ -0,0 +1,123 @@ +package com.ruoyi.bps.controller; + +import com.ruoyi.bps.domain.ExpSubsPushResp; +import com.ruoyi.bps.service.IExpSubsPushRespService; +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.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 快递订阅推送信息增删改查Controller + * + * @author box + * @date 2021-05-13 + */ +@Controller +@RequestMapping("/bps/expsubspushresp") +public class ExpSubsPushRespController extends BaseController +{ + private String prefix = "bps/expsubspushresp"; + + @Autowired + private IExpSubsPushRespService expSubsPushRespService; + + @RequiresPermissions("bps:expsubspushresp:view") + @GetMapping() + public String expsubspushresp() + { + return prefix + "/expsubspushresp"; + } + + /** + * 查询快递订阅推送信息列表 + */ + @RequiresPermissions("bps:expsubspushresp:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(ExpSubsPushResp expSubsPushResp) + { + startPage(); + List list = expSubsPushRespService.selectExpSubsPushRespList(expSubsPushResp); + return getDataTable(list); + } + + /** + * 导出快递订阅推送信息列表 + */ + @RequiresPermissions("bps:expsubspushresp:export") + @Log(title = "快递订阅推送信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(ExpSubsPushResp expSubsPushResp) + { + List list = expSubsPushRespService.selectExpSubsPushRespList(expSubsPushResp); + ExcelUtil util = new ExcelUtil(ExpSubsPushResp.class); + return util.exportExcel(list, "快递订阅推送信息数据"); + } + + /** + * 新增快递订阅推送信息 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存快递订阅推送信息 + */ + @RequiresPermissions("bps:expsubspushresp:add") + @Log(title = "快递订阅推送信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(ExpSubsPushResp expSubsPushResp) + { + return toAjax(expSubsPushRespService.insertExpSubsPushResp(expSubsPushResp)); + } + + /** + * 修改快递订阅推送信息 + */ + @GetMapping("/edit/{sid}") + public String edit(@PathVariable("sid") Long sid, ModelMap mmap) + { + ExpSubsPushResp expSubsPushResp = expSubsPushRespService.selectExpSubsPushRespById(sid); + mmap.put("expSubsPushResp", expSubsPushResp); + return prefix + "/edit"; + } + + /** + * 修改保存快递订阅推送信息 + */ + @RequiresPermissions("bps:expsubspushresp:edit") + @Log(title = "快递订阅推送信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(ExpSubsPushResp expSubsPushResp) + { + return toAjax(expSubsPushRespService.updateExpSubsPushResp(expSubsPushResp)); + } + + /** + * 删除快递订阅推送信息 + */ + @RequiresPermissions("bps:expsubspushresp:remove") + @Log(title = "快递订阅推送信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(expSubsPushRespService.deleteExpSubsPushRespByIds(ids)); + } +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/controller/ExpSubscribeController.java b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpSubscribeController.java new file mode 100644 index 000000000..7ff195311 --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpSubscribeController.java @@ -0,0 +1,139 @@ +package com.ruoyi.bps.controller; + +import com.ruoyi.bps.domain.ExpSubscribe; +import com.ruoyi.bps.service.IExpSubsPushApiService; +import com.ruoyi.bps.service.IExpSubscribeService; +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.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.kuaidi100.sdk.response.SubscribeResp; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 快递订阅Controller + * + * @author box + * @date 2021-05-20 + */ +@Controller +@RequestMapping("/bps/subscribe") +public class ExpSubscribeController extends BaseController +{ + private String prefix = "bps/subscribe"; + + @Autowired + private IExpSubscribeService expSubscribeService; + + @Autowired + private IExpSubsPushApiService iExpSubsPushApiService; + + @RequiresPermissions("bps:subscribe:view") + @GetMapping() + public String subscribe() + { + return prefix + "/subscribe"; + } + + /** + * 订阅快递 + */ + @CrossOrigin + @RequestMapping("/subscribe") + @ResponseBody + public SubscribeResp ExpressSubscribe(@RequestBody ExpSubscribe expSubscribe) { + return iExpSubsPushApiService.ExpressSubscribe(expSubscribe); + } + + + /** + * 查询快递订阅列表 + */ + @RequiresPermissions("bps:subscribe:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(ExpSubscribe expSubscribe) + { + startPage(); + List list = expSubscribeService.selectExpSubscribeList(expSubscribe); + return getDataTable(list); + } + + /** + * 导出快递订阅列表 + */ + @RequiresPermissions("bps:subscribe:export") + @Log(title = "快递订阅", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(ExpSubscribe expSubscribe) + { + List list = expSubscribeService.selectExpSubscribeList(expSubscribe); + ExcelUtil util = new ExcelUtil(ExpSubscribe.class); + return util.exportExcel(list, "快递订阅数据"); + } + + /** + * 新增快递订阅 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存快递订阅 + */ + @RequiresPermissions("bps:subscribe:add") + @Log(title = "快递订阅", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(ExpSubscribe expSubscribe) + { + return toAjax(expSubscribeService.insertExpSubscribe(expSubscribe)); + } + + /** + * 修改快递订阅 + */ + @GetMapping("/edit/{sid}") + public String edit(@PathVariable("sid") Long sid, ModelMap mmap) + { + ExpSubscribe expSubscribe = expSubscribeService.selectExpSubscribeById(sid); + mmap.put("expSubscribe", expSubscribe); + return prefix + "/edit"; + } + + /** + * 修改保存快递订阅 + */ + @RequiresPermissions("bps:subscribe:edit") + @Log(title = "快递订阅", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(ExpSubscribe expSubscribe) + { + return toAjax(expSubscribeService.updateExpSubscribe(expSubscribe)); + } + + /** + * 删除快递订阅 + */ + @RequiresPermissions("bps:subscribe:remove") + @Log(title = "快递订阅", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(expSubscribeService.deleteExpSubscribeByIds(ids)); + } +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/controller/ExpressInfoController.java b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpressInfoController.java new file mode 100644 index 000000000..ae09c6b0b --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpressInfoController.java @@ -0,0 +1,124 @@ +package com.ruoyi.bps.controller; + +import com.ruoyi.bps.domain.ExpressInfo; +import com.ruoyi.bps.service.IExpressInfoService; +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.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 快递信息Controller + * + * @author box + * @date 2021-05-06 + */ +@Controller +@RequestMapping("/bps/expressInfo") +public class ExpressInfoController extends BaseController +{ + private String prefix = "bps/expressInfo"; + + @Autowired + private IExpressInfoService expressInfoService; + + @RequiresPermissions("bps:expressInfo:view") + @GetMapping() + public String expressInfo() + { + return prefix + "/expressInfo"; + } + + /** + * 查询快递信息列表 + */ + @RequiresPermissions("bps:expressInfo:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(ExpressInfo expressInfo) + { + startPage(); + List list = expressInfoService.selectExpressInfoList(expressInfo); + return getDataTable(list); + } + + /** + * 导出快递信息列表 + */ + @RequiresPermissions("bps:expressInfo:export") + @Log(title = "快递信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(ExpressInfo expressInfo) + { + List list = expressInfoService.selectExpressInfoList(expressInfo); + ExcelUtil util = new ExcelUtil(ExpressInfo.class); + return util.exportExcel(list, "快递信息数据"); + } + + /** + * 新增快递信息 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存快递信息 + */ + @RequiresPermissions("bps:expressInfo:add") + @Log(title = "快递信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(ExpressInfo expressInfo) + { + return toAjax(expressInfoService.insertExpressInfo(expressInfo)); + } + + /** + * 修改快递信息 + */ + @GetMapping("/edit/{message}") + public String edit(@PathVariable("message") String message, ModelMap mmap) + { + ExpressInfo expressInfo = expressInfoService.selectExpressInfoById(message); + mmap.put("expressInfo", expressInfo); + return prefix + "/edit"; + } + + /** + * 修改保存快递信息 + */ + @RequiresPermissions("bps:expressInfo:edit") + @Log(title = "快递信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(ExpressInfo expressInfo) + { + return toAjax(expressInfoService.updateExpressInfo(expressInfo)); + } + + /** + * 删除快递信息 + */ + @RequiresPermissions("bps:expressInfo:remove") + @Log(title = "快递信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(expressInfoService.deleteExpressInfoByIds(ids)); + } +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/controller/ExpressTestController.java b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpressTestController.java new file mode 100644 index 000000000..c248bc8e6 --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpressTestController.java @@ -0,0 +1,50 @@ +package com.ruoyi.bps.controller; + + +//import com.ruoyi.bps.express.contant.CompanyConstant; +//import com.ruoyi.bps.express.request.QueryTrackParam; + +import com.ruoyi.bps.service.IExpressService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.page.TableDataInfo; +import com.kuaidi100.sdk.request.QueryTrackParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class ExpressTestController extends BaseController { + @Autowired + private IExpressService expressService; + + @RequestMapping("/anon/bps/express/test/queryTrackMultiList") + public TableDataInfo QueryTrackMultiList(){ + //return expressService.QueryTrackExpressMultiList(expressService.GetTestQueryTrackParam()).toString(); + return getDataTable(expressService.QueryTrackExpressMultiList(expressService.GetTestQueryTrackParam())); + } + + @RequestMapping("/anon/bps/express/test/queryTrackMulti") + public String QueryTrackMulti(){ + return expressService.QueryTrackExpressMulti(expressService.GetTestQueryTrackParam()); + } + + @RequestMapping("/anon/bps/express/test/queryTrack") + public String QueryTrack(){ + QueryTrackParam queryTrackParam = new QueryTrackParam(); + queryTrackParam.setCom("annengwuliu"); + queryTrackParam.setNum("3004459671351"); + queryTrackParam.setPhone("17725390266"); + + return expressService.QueryTrackExpress(queryTrackParam); + + + } + @RequestMapping("/anon/bps/express/test/subscribe") + public String Subscribe(){ + return expressService.SubscribeExpress(); + } + + + + +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/controller/FrForCrTopgpController.java b/box-bps/src/main/java/com/ruoyi/bps/controller/FrForCrTopgpController.java new file mode 100644 index 000000000..c0d8f02a3 --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/controller/FrForCrTopgpController.java @@ -0,0 +1,102 @@ +package com.ruoyi.bps.controller; + +import com.ruoyi.bps.service.TopgpDdlService; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@RestController +public class FrForCrTopgpController { + @Autowired + private TopgpDdlService topgpDdlService; + + //访问 ../anon/bps/frforcr/topprod时，使用topprod + @CrossOrigin + @Log(title = "CSFR412_CR报表_TOPPROD", businessType = BusinessType.DROP) + @RequestMapping("/anon/bps/frforcr/topprod") + @DataSource(value = DataSourceType.TOPPRODDSREPORT) + public AjaxResult frforcrtopprod(@RequestBody Map map){ + return frforcrtoppgp(map); + } + + //访问../anon/bps/frforcr/topprod时，使用toptest实例 + @CrossOrigin + @Log(title = "CSFR412_CR报表_TOPTEST", businessType = BusinessType.DROP) + @RequestMapping("/anon/bps/frforcr/toptest") + @DataSource(value = DataSourceType.TOPTESTDSREPORT) + public AjaxResult frforcrtoptest(@RequestBody Map map){ + return frforcrtoppgp(map); + } + + private AjaxResult frforcrtoppgp(Map map){ + /* 多此一举，在@RequestBody时取不到值是，已经会报500错误了，并不会执行到这一段。 + if(map.isEmpty()){ //如果传过来的值为空，返回未取到表名 + // System.out.println(LocalTime.now()+"未获取到表名！"); + return AjaxResult.error("未取到表名传参！"); + } + */ + StringBuilder droppedTable = new StringBuilder(); + StringBuilder errorDroppedTable = new StringBuilder(); + StringBuilder notExistsTable = new StringBuilder(); + + for (String tableName : getTableName(map)) { + if(topgpDdlService.isTableInDb("ds_report",tableName) <=0){ + //表名在数据库中不存在 + //System.out.println(LocalTime.now() + "【" + tableName + "】不存在！"); + notExistsTable.append(tableName+","); + continue; + } + + try { + topgpDdlService.dropTable("ds_report." + tableName); + //System.out.println(LocalTime.now() + "【" + tableName + "】已被删除！"); + droppedTable.append(tableName+","); + } catch (Exception e) { + //System.out.println(LocalTime.now() + "【" + tableName + "】删除异常！"); + errorDroppedTable.append(tableName+","); + } + } + + //删除异常写入日志 + if (StringUtils.isNotEmpty(errorDroppedTable)){ + return AjaxResult.error(errorDroppedTable+"删除异常！"); + } + //表不存在写入日志 + if(StringUtils.isNotEmpty(notExistsTable)){ + return AjaxResult.warn(notExistsTable+"表不存在！"); + } + //被删除的表写入日志 + if(StringUtils.isNotEmpty(droppedTable)){ + return AjaxResult.success(droppedTable + "删除成功！"); + } + //以上三种情况都不存在，说明发生了不明异常，写入日志 + return AjaxResult.warn("发生不明异常！"); + } + + //防止意手抖把SID也当成表传过来 + //排除sid的key值 + private List getTableName(Map map){ + List list=new ArrayList(); + for(String key:map.keySet()){ + if(key !="sid") + { + list.add(map.get(key).toString()); + } + } + return list; + } +} + + diff --git a/box-bps/src/main/java/com/ruoyi/bps/controller/QueryExpressController.java b/box-bps/src/main/java/com/ruoyi/bps/controller/QueryExpressController.java new file mode 100644 index 000000000..faa2d2510 --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/controller/QueryExpressController.java @@ -0,0 +1,103 @@ +package com.ruoyi.bps.controller; + + +//import com.ruoyi.bps.express.contant.CompanyConstant; +//import com.ruoyi.bps.express.request.QueryTrackParam; +//import com.ruoyi.bps.express.response.QueryTrackResp; + +import com.ruoyi.bps.service.IExpressService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.page.TableDataInfo; +import com.google.gson.Gson; +import com.kuaidi100.sdk.request.QueryTrackParam; +import com.kuaidi100.sdk.response.QueryTrackResp; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.Map; + +@Controller +public class QueryExpressController extends BaseController { + @Autowired + private IExpressService expressService; + @RequiresPermissions("bps:express:view") + @RequestMapping("/bps/express/queryExpress") + public String queryExpress() + { + //return "express/queryExpress"; + //说明：此处不能用绝对路径，否则，当application.yml中，设定context-path: /it_war后，打Jar包时，会找不到thymeleaf对应的文件。 + return "express/queryExpress"; + } + + @CrossOrigin + @RequestMapping("/bps/express/queryExpress/list") + @ResponseBody + public Map queryExpressList(@RequestBody QueryTrackParam queryTrackParam){ + Map result = null; + if (queryTrackParam != null) { + System.out.println("运单号码：" + queryTrackParam.getNum()); + System.out.println("快递公司：" + queryTrackParam.getCom()); + System.out.println("电话：" + queryTrackParam.getPhone()); + result = new HashMap<>(); + result.put("code", "1"); + result.put("msg", "ok"); + result.put("info",expressService.QueryTrackExpress(queryTrackParam)); + } + return result; + } + + @CrossOrigin + @RequestMapping("/bps/express/queryExpress/list1") + @ResponseBody + public Map queryExpressList1(@RequestBody QueryTrackParam queryTrackParam){ + Map result = null; + if (queryTrackParam != null) { + System.out.println("运单号码：" + queryTrackParam.getNum()); + System.out.println("快递公司：" + queryTrackParam.getCom()); + System.out.println("电话：" + queryTrackParam.getPhone()); + String info=expressService.QueryTrackExpress(queryTrackParam); + QueryTrackResp queryTrackResp = new Gson().fromJson(info,QueryTrackResp.class); + result = new HashMap<>(); + result.put("code", "1"); + result.put("msg", "ok"); + result.put("nu",queryTrackResp.getNu()); + result.put("com",queryTrackResp.getCom()); + result.put("state",queryTrackResp.getState()); + result.put("info",queryTrackResp.getData()); + } + return result; + } + + @RequestMapping("/anon/bps/express/queryTrackMultiList") + public TableDataInfo QueryTrackMultiList(@RequestBody QueryTrackParam queryTrackParam){ + + return getDataTable(expressService.QueryTrackExpressMultiList(expressService.GetTestQueryTrackParam())); + } + + @RequestMapping("/anon/bps/express/queryTrackMulti") + public String QueryTrackMulti(){ + return expressService.QueryTrackExpressMulti(expressService.GetTestQueryTrackParam()); + } + + @RequestMapping("/anon/bps/express/queryTrack") + public String QueryTrack(){ + QueryTrackParam queryTrackParam = new QueryTrackParam(); + queryTrackParam.setCom("annengwuliu"); + queryTrackParam.setNum("3004459671351"); + queryTrackParam.setPhone("17725390266"); + + return expressService.QueryTrackExpress(queryTrackParam); + + + } + @RequestMapping("/anon/bps/express/subscribe") + public String Subscribe(){ + return expressService.SubscribeExpress(); + } +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/domain/ExpSubsPushResp.java b/box-bps/src/main/java/com/ruoyi/bps/domain/ExpSubsPushResp.java new file mode 100644 index 000000000..d9e9a4fcc --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/domain/ExpSubsPushResp.java @@ -0,0 +1,345 @@ +package com.ruoyi.bps.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 快递订阅推送信息对象 exp_subs_push_resp + * + * @author box + * @date 2021-05-13 + */ +public class ExpSubsPushResp extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** SID */ + private Long sid; + + /** 监控状态 */ + @Excel(name = "监控状态") + private String status; + + /** 状态 */ + @Excel(name = "状态") + private String billStatus; + + /** 监控状态消息 */ + @Excel(name = "监控状态消息") + private String message; + + /** 快递公司编码是否出错 */ + @Excel(name = "快递公司编码是否出错") + private String autoCheck; + + /** 原始快递公司编码 */ + @Excel(name = "原始快递公司编码") + private String comOld; + + /** 修正快递公司编码 */ + @Excel(name = "修正快递公司编码") + private String comNew; + + /** 当前快递消息 */ + @Excel(name = "当前快递消息") + private String lastResultMessage; + + /** 当前快递单状态 */ + @Excel(name = "当前快递单状态") + private String lastResultState; + + /** 通讯状态 */ + @Excel(name = "通讯状态") + private String lastResulStatus; + + /** 快递单明细状态 */ + @Excel(name = "快递单明细状态") + private String lastResultCondition; + + /** 是否签收 */ + @Excel(name = "是否签收") + private String lastResultIsCheck; + + /** 快递公司编码 */ + @Excel(name = "快递公司编码") + private String lastResultCom; + + /** 快递单号 */ + @Excel(name = "快递单号") + private String lastResultNu; + + /** 快递流转信息 */ + @Excel(name = "快递流转信息") + private String lastResultData; + + /** 目的国快递消息 */ + @Excel(name = "目的国快递消息") + private String destResultMessage; + + /** 目的国快递单状态 */ + @Excel(name = "目的国快递单状态") + private String destResultState; + + /** 目的国通讯状态 */ + @Excel(name = "目的国通讯状态") + private String destResultStatus; + + /** 目的国快递单明细状态 */ + @Excel(name = "目的国快递单明细状态") + private String destResultCondition; + + /** 目的国是否签收 */ + @Excel(name = "目的国是否签收") + private String destResultIsCheck; + + /** 目的国快递公司编码 */ + @Excel(name = "目的国快递公司编码") + private String destResultCom; + + /** 目的国快递单号 */ + @Excel(name = "目的国快递单号") + private String destResultNu; + + /** 目的国快递流转信息 */ + @Excel(name = "目的国快递流转信息") + private String destResultData; + + public void setSid(Long sid) + { + this.sid = sid; + } + + public Long getSid() + { + return sid; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setBillStatus(String billStatus) + { + this.billStatus = billStatus; + } + + public String getBillStatus() + { + return billStatus; + } + public void setMessage(String message) + { + this.message = message; + } + + public String getMessage() + { + return message; + } + public void setAutoCheck(String autoCheck) + { + this.autoCheck = autoCheck; + } + + public String getAutoCheck() + { + return autoCheck; + } + public void setComOld(String comOld) + { + this.comOld = comOld; + } + + public String getComOld() + { + return comOld; + } + public void setComNew(String comNew) + { + this.comNew = comNew; + } + + public String getComNew() + { + return comNew; + } + public void setLastResultMessage(String lastResultMessage) + { + this.lastResultMessage = lastResultMessage; + } + + public String getLastResultMessage() + { + return lastResultMessage; + } + public void setLastResultState(String lastResultState) + { + this.lastResultState = lastResultState; + } + + public String getLastResultState() + { + return lastResultState; + } + public void setLastResulStatus(String lastResulStatus) + { + this.lastResulStatus = lastResulStatus; + } + + public String getLastResulStatus() + { + return lastResulStatus; + } + public void setLastResultCondition(String lastResultCondition) + { + this.lastResultCondition = lastResultCondition; + } + + public String getLastResultCondition() + { + return lastResultCondition; + } + public void setLastResultIsCheck(String lastResultIsCheck) + { + this.lastResultIsCheck = lastResultIsCheck; + } + + public String getLastResultIsCheck() + { + return lastResultIsCheck; + } + public void setLastResultCom(String lastResultCom) + { + this.lastResultCom = lastResultCom; + } + + public String getLastResultCom() + { + return lastResultCom; + } + public void setLastResultNu(String lastResultNu) + { + this.lastResultNu = lastResultNu; + } + + public String getLastResultNu() + { + return lastResultNu; + } + public void setLastResultData(String lastResultData) + { + this.lastResultData = lastResultData; + } + + public String getLastResultData() + { + return lastResultData; + } + public void setDestResultMessage(String destResultMessage) + { + this.destResultMessage = destResultMessage; + } + + public String getDestResultMessage() + { + return destResultMessage; + } + public void setDestResultState(String destResultState) + { + this.destResultState = destResultState; + } + + public String getDestResultState() + { + return destResultState; + } + public void setDestResultStatus(String destResultStatus) + { + this.destResultStatus = destResultStatus; + } + + public String getDestResultStatus() + { + return destResultStatus; + } + public void setDestResultCondition(String destResultCondition) + { + this.destResultCondition = destResultCondition; + } + + public String getDestResultCondition() + { + return destResultCondition; + } + public void setDestResultIsCheck(String destResultIsCheck) + { + this.destResultIsCheck = destResultIsCheck; + } + + public String getDestResultIsCheck() + { + return destResultIsCheck; + } + public void setDestResultCom(String destResultCom) + { + this.destResultCom = destResultCom; + } + + public String getDestResultCom() + { + return destResultCom; + } + public void setDestResultNu(String destResultNu) + { + this.destResultNu = destResultNu; + } + + public String getDestResultNu() + { + return destResultNu; + } + public void setDestResultData(String destResultData) + { + this.destResultData = destResultData; + } + + public String getDestResultData() + { + return destResultData; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("sid", getSid()) + .append("status", getStatus()) + .append("billStatus", getBillStatus()) + .append("message", getMessage()) + .append("autoCheck", getAutoCheck()) + .append("comOld", getComOld()) + .append("comNew", getComNew()) + .append("lastResultMessage", getLastResultMessage()) + .append("lastResultState", getLastResultState()) + .append("lastResulStatus", getLastResulStatus()) + .append("lastResultCondition", getLastResultCondition()) + .append("lastResultIsCheck", getLastResultIsCheck()) + .append("lastResultCom", getLastResultCom()) + .append("lastResultNu", getLastResultNu()) + .append("lastResultData", getLastResultData()) + .append("destResultMessage", getDestResultMessage()) + .append("destResultState", getDestResultState()) + .append("destResultStatus", getDestResultStatus()) + .append("destResultCondition", getDestResultCondition()) + .append("destResultIsCheck", getDestResultIsCheck()) + .append("destResultCom", getDestResultCom()) + .append("destResultNu", getDestResultNu()) + .append("destResultData", getDestResultData()) + .toString(); + } +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/domain/ExpSubscribe.java b/box-bps/src/main/java/com/ruoyi/bps/domain/ExpSubscribe.java new file mode 100644 index 000000000..2ef48209f --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/domain/ExpSubscribe.java @@ -0,0 +1,149 @@ +package com.ruoyi.bps.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 快递订阅对象 exp_subscribe + * + * @author box + * @date 2021-05-20 + */ +public class ExpSubscribe extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** SID */ + private Long sid; + + /** 快递公司编码 */ + @Excel(name = "快递公司编码") + private String company; + + /** 快递单号 */ + @Excel(name = "快递单号") + private String number; + + /** 收/寄件人电话 */ + @Excel(name = "收/寄件人电话") + private String phone; + + /** 盐 */ + @Excel(name = "盐") + private String salt; + + /** 订阅时间 */ + @Excel(name = "订阅时间") + private String subscribeTime; + + /** 订阅结果 */ + @Excel(name = "订阅结果") + private String result; + + /** 返回码 */ + @Excel(name = "返回码") + private String returnCode; + + /** 返回消息 */ + @Excel(name = "返回消息") + private String message; + + public void setSid(Long sid) + { + this.sid = sid; + } + + public Long getSid() + { + return sid; + } + public void setCompany(String company) + { + this.company = company; + } + + public String getCompany() + { + return company; + } + public void setNumber(String number) + { + this.number = number; + } + + public String getNumber() + { + return number; + } + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getPhone() + { + return phone; + } + public void setSalt(String salt) + { + this.salt = salt; + } + + public String getSalt() + { + return salt; + } + public void setSubscribeTime(String subscribeTime) + { + this.subscribeTime = subscribeTime; + } + + public String getSubscribeTime() + { + return subscribeTime; + } + public void setResult(String result) + { + this.result = result; + } + + public String getResult() + { + return result; + } + public void setReturnCode(String returnCode) + { + this.returnCode = returnCode; + } + + public String getReturnCode() + { + return returnCode; + } + public void setMessage(String message) + { + this.message = message; + } + + public String getMessage() + { + return message; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("sid", getSid()) + .append("company", getCompany()) + .append("number", getNumber()) + .append("phone", getPhone()) + .append("salt", getSalt()) + .append("subscribeTime", getSubscribeTime()) + .append("result", getResult()) + .append("returnCode", getReturnCode()) + .append("message", getMessage()) + .toString(); + } +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/domain/ExpressInfo.java b/box-bps/src/main/java/com/ruoyi/bps/domain/ExpressInfo.java new file mode 100644 index 000000000..72b2d967e --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/domain/ExpressInfo.java @@ -0,0 +1,192 @@ +package com.ruoyi.bps.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 快递信息对象 expressInfo + * + * @author box + * @date 2021-05-06 + */ +public class ExpressInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 消息 */ + @Excel(name = "消息") + private String message; + + /** 快递单号 */ + @Excel(name = "快递单号") + private String nu; + + /** 签收状态 */ + @Excel(name = "签收状态") + private String ischeck; + + /** 快递公司 */ + @Excel(name = "快递公司") + private String com; + + /** 通信状态 */ + @Excel(name = "通信状态") + private String status; + + /** 运单详情 */ + @Excel(name = "运单详情") + private String data; + + /** 当前状态 */ + @Excel(name = "当前状态") + private String state; + + /** 状态标志 */ + @Excel(name = "状态标志") + private String condition; + + /** 路由信息 */ + @Excel(name = "路由信息") + private String routeInfo; + + /** 返回码 */ + @Excel(name = "返回码") + private String returnCode; + + /** 返回结果 */ + @Excel(name = "返回结果") + private String result; + + /** 电话号码 */ + @Excel(name = "电话号码") + private String phone; + + public void setMessage(String message) + { + this.message = message; + } + + public String getMessage() + { + return message; + } + public void setNu(String nu) + { + this.nu = nu; + } + + public String getNu() + { + return nu; + } + public void setIscheck(String ischeck) + { + this.ischeck = ischeck; + } + + public String getIscheck() + { + return ischeck; + } + public void setCom(String com) + { + this.com = com; + } + + public String getCom() + { + return com; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setData(String data) + { + this.data = data; + } + + public String getData() + { + return data; + } + public void setState(String state) + { + this.state = state; + } + + public String getState() + { + return state; + } + public void setCondition(String condition) + { + this.condition = condition; + } + + public String getCondition() + { + return condition; + } + public void setRouteInfo(String routeInfo) + { + this.routeInfo = routeInfo; + } + + public String getRouteInfo() + { + return routeInfo; + } + public void setReturnCode(String returnCode) + { + this.returnCode = returnCode; + } + + public String getReturnCode() + { + return returnCode; + } + public void setResult(String result) + { + this.result = result; + } + + public String getResult() + { + return result; + } + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getPhone() + { + return phone; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("message", getMessage()) + .append("nu", getNu()) + .append("ischeck", getIscheck()) + .append("com", getCom()) + .append("status", getStatus()) + .append("data", getData()) + .append("state", getState()) + .append("condition", getCondition()) + .append("routeInfo", getRouteInfo()) + .append("returnCode", getReturnCode()) + .append("result", getResult()) + .append("phone", getPhone()) + .toString(); + } +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/mapper/ExpSubsPushRespMapper.java b/box-bps/src/main/java/com/ruoyi/bps/mapper/ExpSubsPushRespMapper.java new file mode 100644 index 000000000..f1a0bac8b --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/mapper/ExpSubsPushRespMapper.java @@ -0,0 +1,64 @@ +package com.ruoyi.bps.mapper; + +import com.ruoyi.bps.domain.ExpSubsPushResp; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +/** + * 快递订阅推送信息Mapper接口 + * + * @author box + * @date 2021-05-13 + */ +public interface ExpSubsPushRespMapper +{ + /** + * 查询快递订阅推送信息 + * + * @param sid 快递订阅推送信息ID + * @return 快递订阅推送信息 + */ + public ExpSubsPushResp selectExpSubsPushRespById(Long sid); + + /** + * 查询快递订阅推送信息列表 + * + * @param expSubsPushResp 快递订阅推送信息 + * @return 快递订阅推送信息集合 + */ + public List selectExpSubsPushRespList(ExpSubsPushResp expSubsPushResp); + + /** + * 新增快递订阅推送信息 + * + * @param expSubsPushResp 快递订阅推送信息 + * @return 结果 + */ + public int insertExpSubsPushResp(ExpSubsPushResp expSubsPushResp); + + /** + * 修改快递订阅推送信息 + * + * @param expSubsPushResp 快递订阅推送信息 + * @return 结果 + */ + public int updateExpSubsPushResp(ExpSubsPushResp expSubsPushResp); + + /** + * 删除快递订阅推送信息 + * + * @param sid 快递订阅推送信息ID + * @return 结果 + */ + public int deleteExpSubsPushRespById(Long sid); + + /** + * 批量删除快递订阅推送信息 + * + * @param sids 需要删除的数据ID + * @return 结果 + */ + public int deleteExpSubsPushRespByIds(String[] sids); +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/mapper/ExpSubscribeMapper.java b/box-bps/src/main/java/com/ruoyi/bps/mapper/ExpSubscribeMapper.java new file mode 100644 index 000000000..04a74c70c --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/mapper/ExpSubscribeMapper.java @@ -0,0 +1,64 @@ +package com.ruoyi.bps.mapper; + +import com.ruoyi.bps.domain.ExpSubscribe; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +/** + * 快递订阅Mapper接口 + * + * @author box + * @date 2021-05-20 + */ +public interface ExpSubscribeMapper +{ + /** + * 查询快递订阅 + * + * @param sid 快递订阅ID + * @return 快递订阅 + */ + public ExpSubscribe selectExpSubscribeById(Long sid); + + /** + * 查询快递订阅列表 + * + * @param expSubscribe 快递订阅 + * @return 快递订阅集合 + */ + public List selectExpSubscribeList(ExpSubscribe expSubscribe); + + /** + * 新增快递订阅 + * + * @param expSubscribe 快递订阅 + * @return 结果 + */ + public int insertExpSubscribe(ExpSubscribe expSubscribe); + + /** + * 修改快递订阅 + * + * @param expSubscribe 快递订阅 + * @return 结果 + */ + public int updateExpSubscribe(ExpSubscribe expSubscribe); + + /** + * 删除快递订阅 + * + * @param sid 快递订阅ID + * @return 结果 + */ + public int deleteExpSubscribeById(Long sid); + + /** + * 批量删除快递订阅 + * + * @param sids 需要删除的数据ID + * @return 结果 + */ + public int deleteExpSubscribeByIds(String[] sids); +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/mapper/ExpressInfoMapper.java b/box-bps/src/main/java/com/ruoyi/bps/mapper/ExpressInfoMapper.java new file mode 100644 index 000000000..4dede87d7 --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/mapper/ExpressInfoMapper.java @@ -0,0 +1,64 @@ +package com.ruoyi.bps.mapper; + +import com.ruoyi.bps.domain.ExpressInfo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +/** + * 快递信息Mapper接口 + * + * @author box + * @date 2021-05-06 + */ +public interface ExpressInfoMapper +{ + /** + * 查询快递信息 + * + * @param message 快递信息ID + * @return 快递信息 + */ + public ExpressInfo selectExpressInfoById(String message); + + /** + * 查询快递信息列表 + * + * @param expressInfo 快递信息 + * @return 快递信息集合 + */ + public List selectExpressInfoList(ExpressInfo expressInfo); + + /** + * 新增快递信息 + * + * @param expressInfo 快递信息 + * @return 结果 + */ + public int insertExpressInfo(ExpressInfo expressInfo); + + /** + * 修改快递信息 + * + * @param expressInfo 快递信息 + * @return 结果 + */ + public int updateExpressInfo(ExpressInfo expressInfo); + + /** + * 删除快递信息 + * + * @param message 快递信息ID + * @return 结果 + */ + public int deleteExpressInfoById(String message); + + /** + * 批量删除快递信息 + * + * @param messages 需要删除的数据ID + * @return 结果 + */ + public int deleteExpressInfoByIds(String[] messages); +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/mapper/TopgpDdlMapper.java b/box-bps/src/main/java/com/ruoyi/bps/mapper/TopgpDdlMapper.java new file mode 100644 index 000000000..ad06f7d89 --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/mapper/TopgpDdlMapper.java @@ -0,0 +1,32 @@ +package com.ruoyi.bps.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; + +@Mapper +@Component("TopgpDdlMapper") +public interface TopgpDdlMapper { + // alter table + int alterTableName(@Param("originalTableName") String originalTableName, + @Param("newTableName") String newTableName); + + //truncate table + int truncateTable(@Param("tableName") String tableName); + + //drop table + int dropTable(@Param("tableName") String tableName); + + //copy table + void copyTable(@Param("newTableName") String newTableName, + @Param("originalTableName") String originalTableName); + + //获取表记录数 + int getRecordCount(@Param("tableName") String tableName); + + + + //查询数据库中表是否存在 + int isTableInDb(@Param("dataBaseName") String dataBaseName, + @Param("tableName") String tableName); +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/IExpSubsPushApiService.java b/box-bps/src/main/java/com/ruoyi/bps/service/IExpSubsPushApiService.java new file mode 100644 index 000000000..5867116de --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/service/IExpSubsPushApiService.java @@ -0,0 +1,22 @@ +package com.ruoyi.bps.service; + +import com.ruoyi.bps.domain.ExpSubscribe; +import com.kuaidi100.sdk.response.SubscribeResp; + +import javax.servlet.http.HttpServletRequest; + +public interface IExpSubsPushApiService { + public SubscribeResp ExpressSubscribe(ExpSubscribe expSubscribe); + + /** + * 快递100订阅推送处理 + * + * 回调接口支持自定义参数,比如订阅时回调地址填写的是 http://www.xxx.com?orderId=1233333 + * 可以通过下面这种方式获取到orderId： String orderId = request.getParameter("orderId"); + * + * 返回值必须是下面这样的格式，否则快递100将认为该推送失败，快递100将会重试3次该推送，时间间隔35分钟； + * 成功结果返回例子： {"result":true,"returnCode":"200","message":"提交成功"} + * + */ + public SubscribeResp ExpressSubscribeCallBackUrl(HttpServletRequest request); +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/IExpSubsPushRespService.java b/box-bps/src/main/java/com/ruoyi/bps/service/IExpSubsPushRespService.java new file mode 100644 index 000000000..61a6f4aba --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/service/IExpSubsPushRespService.java @@ -0,0 +1,63 @@ +package com.ruoyi.bps.service; + +import com.ruoyi.bps.domain.ExpSubsPushResp; + +import java.util.List; + +/** + * 快递订阅推送信息Service接口 + * + * @author box + * @date 2021-05-13 + */ +public interface IExpSubsPushRespService +{ + /** + * 查询快递订阅推送信息 + * + * @param sid 快递订阅推送信息ID + * @return 快递订阅推送信息 + */ + public ExpSubsPushResp selectExpSubsPushRespById(Long sid); + + /** + * 查询快递订阅推送信息列表 + * + * @param expSubsPushResp 快递订阅推送信息 + * @return 快递订阅推送信息集合 + */ + public List selectExpSubsPushRespList(ExpSubsPushResp expSubsPushResp); + + /** + * 新增快递订阅推送信息 + * + * @param expSubsPushResp 快递订阅推送信息 + * @return 结果 + */ + public int insertExpSubsPushResp(ExpSubsPushResp expSubsPushResp); + + /** + * 修改快递订阅推送信息 + * + * @param expSubsPushResp 快递订阅推送信息 + * @return 结果 + */ + public int updateExpSubsPushResp(ExpSubsPushResp expSubsPushResp); + + /** + * 批量删除快递订阅推送信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteExpSubsPushRespByIds(String ids); + + /** + * 删除快递订阅推送信息信息 + * + * @param sid 快递订阅推送信息ID + * @return 结果 + */ + public int deleteExpSubsPushRespById(Long sid); + +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/IExpSubscribeService.java b/box-bps/src/main/java/com/ruoyi/bps/service/IExpSubscribeService.java new file mode 100644 index 000000000..32079053b --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/service/IExpSubscribeService.java @@ -0,0 +1,62 @@ +package com.ruoyi.bps.service; + +import com.ruoyi.bps.domain.ExpSubscribe; + +import java.util.List; + +/** + * 快递订阅Service接口 + * + * @author box + * @date 2021-05-20 + */ +public interface IExpSubscribeService +{ + /** + * 查询快递订阅 + * + * @param sid 快递订阅ID + * @return 快递订阅 + */ + public ExpSubscribe selectExpSubscribeById(Long sid); + + /** + * 查询快递订阅列表 + * + * @param expSubscribe 快递订阅 + * @return 快递订阅集合 + */ + public List selectExpSubscribeList(ExpSubscribe expSubscribe); + + /** + * 新增快递订阅 + * + * @param expSubscribe 快递订阅 + * @return 结果 + */ + public int insertExpSubscribe(ExpSubscribe expSubscribe); + + /** + * 修改快递订阅 + * + * @param expSubscribe 快递订阅 + * @return 结果 + */ + public int updateExpSubscribe(ExpSubscribe expSubscribe); + + /** + * 批量删除快递订阅 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteExpSubscribeByIds(String ids); + + /** + * 删除快递订阅信息 + * + * @param sid 快递订阅ID + * @return 结果 + */ + public int deleteExpSubscribeById(Long sid); +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/IExpressInfoService.java b/box-bps/src/main/java/com/ruoyi/bps/service/IExpressInfoService.java new file mode 100644 index 000000000..90c079f32 --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/service/IExpressInfoService.java @@ -0,0 +1,62 @@ +package com.ruoyi.bps.service; + +import com.ruoyi.bps.domain.ExpressInfo; + +import java.util.List; + +/** + * 快递信息Service接口 + * + * @author box + * @date 2021-05-06 + */ +public interface IExpressInfoService +{ + /** + * 查询快递信息 + * + * @param message 快递信息ID + * @return 快递信息 + */ + public ExpressInfo selectExpressInfoById(String message); + + /** + * 查询快递信息列表 + * + * @param expressInfo 快递信息 + * @return 快递信息集合 + */ + public List selectExpressInfoList(ExpressInfo expressInfo); + + /** + * 新增快递信息 + * + * @param expressInfo 快递信息 + * @return 结果 + */ + public int insertExpressInfo(ExpressInfo expressInfo); + + /** + * 修改快递信息 + * + * @param expressInfo 快递信息 + * @return 结果 + */ + public int updateExpressInfo(ExpressInfo expressInfo); + + /** + * 批量删除快递信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteExpressInfoByIds(String ids); + + /** + * 删除快递信息信息 + * + * @param message 快递信息ID + * @return 结果 + */ + public int deleteExpressInfoById(String message); +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/IExpressService.java b/box-bps/src/main/java/com/ruoyi/bps/service/IExpressService.java new file mode 100644 index 000000000..b3adfa8da --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/service/IExpressService.java @@ -0,0 +1,33 @@ +package com.ruoyi.bps.service; + +//import com.ruoyi.bps.express.request.QueryTrackParam; +//import com.ruoyi.bps.express.response.QueryTrackResp; + +import com.kuaidi100.sdk.request.QueryTrackParam; +import com.kuaidi100.sdk.response.QueryTrackResp; + +import java.util.List; + +public interface IExpressService { + + public List QueryTrackExpressMultiList(List list); + /** + * 查询多条物流轨迹 + */ + public String QueryTrackExpressMulti(List list); + + /** + * 查询物流轨迹 + */ + public String QueryTrackExpress(QueryTrackParam qt); + + /** + * 订阅 + */ + public String SubscribeExpress(); + + /** + * 测试快递单号合集 + */ + public List GetTestQueryTrackParam(); +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/TopgpDdlService.java b/box-bps/src/main/java/com/ruoyi/bps/service/TopgpDdlService.java new file mode 100644 index 000000000..e2d2b4e6a --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/service/TopgpDdlService.java @@ -0,0 +1,22 @@ +package com.ruoyi.bps.service; + +public interface TopgpDdlService { + //修改表名 + int alterTableName(String originalTableName, String newTableName); + + // truncate指定数据库表的数据 + int truncateTable(String tableName); + + //drop 指定定数据库表 + int dropTable(String tableName); + + + //根据传入的表明，创建新的表并且将原表的数据插入到新的Occur表中 + void copyTable(String newTableName,String originalTableName); + + //统计某张表中的总数据条数 + int getRecordCount(String tableName); + + //从指定数据库中，查询是否存在某张表 + int isTableInDb(String dataBaseName, String tableName); +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/TopgpDdlServiceImpl.java b/box-bps/src/main/java/com/ruoyi/bps/service/TopgpDdlServiceImpl.java new file mode 100644 index 000000000..f2808e873 --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/service/TopgpDdlServiceImpl.java @@ -0,0 +1,45 @@ +package com.ruoyi.bps.service; + +import com.ruoyi.bps.mapper.TopgpDdlMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +//@DataSource(value = DataSourceType.SLAVE) +//@DataSource(value = DataSourceType.TOPTESTDSREPORT) +public class TopgpDdlServiceImpl implements TopgpDdlService { + @Autowired + private TopgpDdlMapper topgpDdlMapper; + + //修改表名 + public int alterTableName(String originalTableName, String newTableName) + { + return topgpDdlMapper.alterTableName(originalTableName,newTableName); + } + + // truncate指定数据库表的数据 + public int truncateTable(String tableName){ + return topgpDdlMapper.truncateTable(tableName); + } + + //drop 指定定数据库表 + public int dropTable(String tableName){ + return topgpDdlMapper.dropTable(tableName); + } + + + //根据传入的表明，创建新的表并且将原表的数据插入到新的Occur表中 + public void copyTable(String newTableName,String originalTableName){ + return ; + } + + //统计某张表中的总数据条数 + public int getRecordCount(String tableName){ + return topgpDdlMapper.getRecordCount(tableName); + } + + //从指定数据库中，查询是否存在某张表 + public int isTableInDb(String dataBaseName, String tableName){ + return topgpDdlMapper.isTableInDb(dataBaseName,tableName); + } +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java new file mode 100644 index 000000000..01bddbce9 --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java @@ -0,0 +1,257 @@ +package com.ruoyi.bps.service.impl; + +import com.ruoyi.bps.domain.ExpSubsPushResp; +import com.ruoyi.bps.domain.ExpSubscribe; +import com.ruoyi.bps.service.IExpSubsPushApiService; +import com.ruoyi.bps.service.IExpSubsPushRespService; +import com.ruoyi.bps.service.IExpSubscribeService; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.google.gson.Gson; +import com.kuaidi100.sdk.api.Subscribe; +import com.kuaidi100.sdk.contant.ApiInfoConstant; +import com.kuaidi100.sdk.core.IBaseClient; +import com.kuaidi100.sdk.pojo.HttpResult; +import com.kuaidi100.sdk.request.SubscribeParam; +import com.kuaidi100.sdk.request.SubscribeParameters; +import com.kuaidi100.sdk.request.SubscribeReq; +import com.kuaidi100.sdk.response.SubscribePushData; +import com.kuaidi100.sdk.response.SubscribePushParamResp; +import com.kuaidi100.sdk.response.SubscribePushResult; +import com.kuaidi100.sdk.response.SubscribeResp; +import com.kuaidi100.sdk.utils.PropertiesReader; +import com.kuaidi100.sdk.utils.SignUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +@Service +public class ExpSubsPushApiServiceImpl implements IExpSubsPushApiService { + String key = PropertiesReader.get("key"); + String customer = PropertiesReader.get("customer"); + String secret = PropertiesReader.get("secret"); + String siid = PropertiesReader.get("siid"); + String userid = PropertiesReader.get("userid"); + String tid = PropertiesReader.get("tid"); + String secret_key = PropertiesReader.get("secret_key"); + String secret_secret = PropertiesReader.get("secret_secret"); + + @Autowired + private IExpSubsPushRespService expSubsPushRespService; + + @Autowired + IExpSubscribeService expSubscribeService; + + /** + * 订阅快递 + * @throws Exception + */ + @Override + public SubscribeResp ExpressSubscribe(ExpSubscribe expSubscribe) { + SubscribeParameters subscribeParameters = new SubscribeParameters(); + SubscribeResp subscribeResp = new SubscribeResp(); + subscribeParameters.setCallbackurl("http://report.bpsemi.cn:8081/it_war/anon/subscribeCallBackUrl"); + subscribeParameters.setPhone(expSubscribe.getPhone()); + subscribeParameters.setSalt("bpsemi"); + SubscribeParam subscribeParam = new SubscribeParam(); + subscribeParam.setParameters(subscribeParameters); + subscribeParam.setCompany(expSubscribe.getCompany()); + subscribeParam.setNumber(expSubscribe.getNumber()); + subscribeParam.setKey(key); + + SubscribeReq subscribeReq = new SubscribeReq(); + subscribeReq.setSchema(ApiInfoConstant.SUBSCRIBE_SCHEMA); + subscribeReq.setParam(new Gson().toJson(subscribeParam)); + + IBaseClient subscribe = new Subscribe(); + try{ + HttpResult httpResult= subscribe.execute(subscribeReq); + System.out.println(httpResult); + subscribeResp= new Gson().fromJson(httpResult.getBody(),SubscribeResp.class); + }catch (Exception e) + { + return subscribeResp; + } + //如果快递公司或快递单号为空，则直接返回订阅结果 + if(StringUtils.isEmpty(expSubscribe.getCompany()) || StringUtils.isEmpty(expSubscribe.getNumber())) + { + return subscribeResp; + } + + //订阅记录写入数据库 + ExpSubscribe newExpSubscribe = new ExpSubscribe(); + newExpSubscribe.setCompany(expSubscribe.getCompany()); + newExpSubscribe.setNumber(expSubscribe.getNumber()); + newExpSubscribe.setPhone(expSubscribe.getPhone()); + newExpSubscribe.setSalt("bpsemi"); + newExpSubscribe.setSubscribeTime(DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss")); + newExpSubscribe.setResult((subscribeResp.isResult())?"ture":"false"); + newExpSubscribe.setReturnCode(subscribeResp.getReturnCode()); + newExpSubscribe.setMessage(subscribeResp.getMessage()); + + ExpSubscribe queryExpSubscribe = new ExpSubscribe(); + queryExpSubscribe.setCompany(expSubscribe.getCompany()); + queryExpSubscribe.setNumber(expSubscribe.getNumber()); + queryExpSubscribe.setResult(expSubscribe.getResult()); + queryExpSubscribe.setReturnCode(expSubscribe.getReturnCode()); + List list=expSubscribeService.selectExpSubscribeList(queryExpSubscribe); + if(list.size()>0){ + //如果数据库中存在快递单号+快递公司编码+结果+返回码相同，则更新记录 + for(ExpSubscribe es:list){ + queryExpSubscribe= newExpSubscribe; + queryExpSubscribe.setSid(es.getSid()); + expSubscribeService.updateExpSubscribe(queryExpSubscribe); + } + }else { + //如果数据库中没有快递单号+快递公司编码，则更插入新记录 + expSubscribeService.insertExpSubscribe(newExpSubscribe); + } + + //返回订阅结果 + return subscribeResp; + } + + /** + * 获取从快递100订阅的快递推送信息，并返回响应结果 + * + * @param request 快递100推送的订阅信息 + * @return 结果 + */ + @Override + public SubscribeResp ExpressSubscribeCallBackUrl(HttpServletRequest request) { + //如果推送信息中没有包含 + if(StringUtils.isEmpty(request.getParameter("param")) + || StringUtils.isEmpty(request.getParameter("sign"))) { + SubscribeResp subscribeResp= new SubscribeResp(); + subscribeResp.setResult(Boolean.FALSE); + subscribeResp.setReturnCode("701"); + subscribeResp.setMessage("推送的信息不合法！"); + return subscribeResp; + } + + String param= request.getParameter("param"); + String sign = request.getParameter("sign"); + //log.debug("快递100订阅推送回调结果|{}|{}",param,sign); + //订阅时传的salt + String salt = "bpsemi"; + String ourSign = SignUtils.sign(param + salt); + SubscribeResp subscribeResp = new SubscribeResp(); + subscribeResp.setResult(Boolean.TRUE); + subscribeResp.setReturnCode("200"); + //加密如果不等，则不属于快递100推送，忽略掉当前请求 + if (!ourSign.equals(sign)){ + subscribeResp.setMessage("接受成功!但加密验证不通过！【sign】"+sign+"【ourSign】"+ourSign); + return subscribeResp; + } + //加密相等，继续处理业务逻辑 + subscribeResp.setMessage("接受成功!加密验证通过！【sign】"+sign+"【ourSign】"+ourSign); + + SubscribePushParamResp subscribePushParamResp = new Gson().fromJson(param, SubscribePushParamResp.class); + SubscribePushResult subscribePushResult = subscribePushParamResp.getLastResult(); + //快递单号 + String nu = subscribePushResult.getNu(); + //监控状态 (polling:监控中，shutdown:结束，abort:中止，updateall：重新推送。其中当快递单为已签收时status=shutdown) + String status= subscribePushParamResp.getStatus(); + if(status.equals("abort")){ + //todo + //当message为“3天查询无记录”或“60天无变化时”status= abort ，对于status=abort的状态的处理逻辑 + //将Abort信息存档。然后预警 + + } + //快递单当前状态 （0在途，1揽收，2疑难，3签收，4退签，5派件，6退回，7转单，10待清关，11清关中，12已清关，13清关异常，14收件人拒签) + String state = subscribePushResult.getState(); + if(state.equals("3")){ + //处理签收逻辑 + //将快递流转状态存入数据库 + ExpSubsPushResp expSubsPushResp=new ExpSubsPushResp(); + expSubsPushResp.setLastResultNu(subscribePushResult.getNu()); + expSubsPushResp.setLastResultCom(subscribePushResult.getCom()); + List list=expSubsPushRespService.selectExpSubsPushRespList(expSubsPushResp); + if(list.size()>0){ + //如果数据库中存在快递单号+快递公司编码，则更新记录 + ExpSubsPushResp newExpSubsPushResp= ToExpSubsPushResp(subscribePushParamResp); + for(ExpSubsPushResp expr:list){ + newExpSubsPushResp.setSid(expr.getSid()); + expSubsPushRespService.updateExpSubsPushResp(newExpSubsPushResp); + newExpSubsPushResp.setSid(null); + } + }else { + //如果数据库中没有快递单号+快递公司编码，则更插入新记录 + expSubsPushRespService.insertExpSubsPushResp(ToExpSubsPushResp(subscribePushParamResp)); + } + } + + return subscribeResp; + } + + /** + * 将快递100推送的信息转换为ExpSubsPushResp + * @param subscribePushParamResp + * @return ExpSubsPushResp + */ + private ExpSubsPushResp ToExpSubsPushResp(SubscribePushParamResp subscribePushParamResp){ + ExpSubsPushResp expSubsPushResp=new ExpSubsPushResp(); + + SubscribePushResult subscribePushLastResult = subscribePushParamResp.getLastResult(); + SubscribePushResult subscribePushDestResult = subscribePushParamResp.getDestResult(); + + expSubsPushResp.setStatus(subscribePushParamResp.getStatus()); + expSubsPushResp.setBillStatus(subscribePushParamResp.getBillstatus()); + expSubsPushResp.setMessage(subscribePushParamResp.getMessage()); + expSubsPushResp.setAutoCheck(subscribePushParamResp.getAutoCheck()); + expSubsPushResp.setComOld(subscribePushParamResp.getComOld()); + expSubsPushResp.setComNew(subscribePushParamResp.getComNew()); + + expSubsPushResp.setLastResultMessage(subscribePushLastResult.getMessage()); + expSubsPushResp.setLastResultState(subscribePushLastResult.getState()); + expSubsPushResp.setLastResulStatus(subscribePushLastResult.getStatus()); + expSubsPushResp.setLastResultCondition(subscribePushLastResult.getCondition()); + expSubsPushResp.setLastResultIsCheck(subscribePushLastResult.getIscheck()); + expSubsPushResp.setLastResultCom(subscribePushLastResult.getCom()); + expSubsPushResp.setLastResultNu(subscribePushLastResult.getNu()); + expSubsPushResp.setLastResultData(SubscribePushDataToString(subscribePushLastResult.getData())); + + if(subscribePushDestResult != null) { + //只有邮政国外的快递推送才会有DestResult信息 + expSubsPushResp.setDestResultMessage(subscribePushDestResult.getMessage()); + expSubsPushResp.setDestResultState(subscribePushDestResult.getState()); + expSubsPushResp.setDestResultStatus(subscribePushDestResult.getStatus()); + expSubsPushResp.setDestResultCondition(subscribePushDestResult.getCondition()); + expSubsPushResp.setDestResultIsCheck(subscribePushDestResult.getIscheck()); + expSubsPushResp.setDestResultCom(subscribePushDestResult.getCom()); + expSubsPushResp.setDestResultNu(subscribePushDestResult.getNu()); + expSubsPushResp.setDestResultData(SubscribePushDataToString(subscribePushDestResult.getData())); + } + + return expSubsPushResp; + } + + /** + * + * @param list 将List转化为字符串 + * @return + */ + private String SubscribePushDataToString(List list){ + String str=""; + for(SubscribePushData subscribePushData:list){ + str+="【"+subscribePushData.getTime()+"】 "; + if(StringUtils.isNotEmpty(subscribePushData.getAreaName())) + { + str+=subscribePushData.getAreaName()+"/"; //某些快递没有AreaName信息 + } + str+=subscribePushData.getContext(); + if(list.size()-1>list.indexOf(subscribePushData)){ + //str+="\r\n"; + str+="
"; + } + } + System.out.println(str); + return str; + } + + + + +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushRespServiceImpl.java b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushRespServiceImpl.java new file mode 100644 index 000000000..777b2568d --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushRespServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.bps.service.impl; + +import com.ruoyi.bps.domain.ExpSubsPushResp; +import com.ruoyi.bps.mapper.ExpSubsPushRespMapper; +import com.ruoyi.bps.service.IExpSubsPushRespService; +import com.ruoyi.common.core.text.Convert; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 快递订阅推送信息Service业务层处理 + * + * @author box + * @date 2021-05-13 + */ +@Service +public class ExpSubsPushRespServiceImpl implements IExpSubsPushRespService +{ + @Autowired + private ExpSubsPushRespMapper expSubsPushRespMapper; + + /** + * 查询快递订阅推送信息 + * + * @param sid 快递订阅推送信息ID + * @return 快递订阅推送信息 + */ + @Override + public ExpSubsPushResp selectExpSubsPushRespById(Long sid) + { + return expSubsPushRespMapper.selectExpSubsPushRespById(sid); + } + + /** + * 查询快递订阅推送信息列表 + * + * @param expSubsPushResp 快递订阅推送信息 + * @return 快递订阅推送信息 + */ + @Override + public List selectExpSubsPushRespList(ExpSubsPushResp expSubsPushResp) + { + return expSubsPushRespMapper.selectExpSubsPushRespList(expSubsPushResp); + } + + /** + * 新增快递订阅推送信息 + * + * @param expSubsPushResp 快递订阅推送信息 + * @return 结果 + */ + @Override + public int insertExpSubsPushResp(ExpSubsPushResp expSubsPushResp) + { + return expSubsPushRespMapper.insertExpSubsPushResp(expSubsPushResp); + } + + /** + * 修改快递订阅推送信息 + * + * @param expSubsPushResp 快递订阅推送信息 + * @return 结果 + */ + @Override + public int updateExpSubsPushResp(ExpSubsPushResp expSubsPushResp) + { + return expSubsPushRespMapper.updateExpSubsPushResp(expSubsPushResp); + } + + /** + * 删除快递订阅推送信息对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteExpSubsPushRespByIds(String ids) + { + return expSubsPushRespMapper.deleteExpSubsPushRespByIds(Convert.toStrArray(ids)); + } + + /** + * 删除快递订阅推送信息信息 + * + * @param sid 快递订阅推送信息ID + * @return 结果 + */ + @Override + public int deleteExpSubsPushRespById(Long sid) + { + return expSubsPushRespMapper.deleteExpSubsPushRespById(sid); + } +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubscribeServiceImpl.java b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubscribeServiceImpl.java new file mode 100644 index 000000000..5ff9d2dcd --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubscribeServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.bps.service.impl; + +import com.ruoyi.bps.domain.ExpSubscribe; +import com.ruoyi.bps.mapper.ExpSubscribeMapper; +import com.ruoyi.bps.service.IExpSubscribeService; +import com.ruoyi.common.core.text.Convert; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 快递订阅Service业务层处理 + * + * @author box + * @date 2021-05-20 + */ +@Service +public class ExpSubscribeServiceImpl implements IExpSubscribeService +{ + @Autowired + private ExpSubscribeMapper expSubscribeMapper; + + /** + * 查询快递订阅 + * + * @param sid 快递订阅ID + * @return 快递订阅 + */ + @Override + public ExpSubscribe selectExpSubscribeById(Long sid) + { + return expSubscribeMapper.selectExpSubscribeById(sid); + } + + /** + * 查询快递订阅列表 + * + * @param expSubscribe 快递订阅 + * @return 快递订阅 + */ + @Override + public List selectExpSubscribeList(ExpSubscribe expSubscribe) + { + return expSubscribeMapper.selectExpSubscribeList(expSubscribe); + } + + /** + * 新增快递订阅 + * + * @param expSubscribe 快递订阅 + * @return 结果 + */ + @Override + public int insertExpSubscribe(ExpSubscribe expSubscribe) + { + return expSubscribeMapper.insertExpSubscribe(expSubscribe); + } + + /** + * 修改快递订阅 + * + * @param expSubscribe 快递订阅 + * @return 结果 + */ + @Override + public int updateExpSubscribe(ExpSubscribe expSubscribe) + { + return expSubscribeMapper.updateExpSubscribe(expSubscribe); + } + + /** + * 删除快递订阅对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteExpSubscribeByIds(String ids) + { + return expSubscribeMapper.deleteExpSubscribeByIds(Convert.toStrArray(ids)); + } + + /** + * 删除快递订阅信息 + * + * @param sid 快递订阅ID + * @return 结果 + */ + @Override + public int deleteExpSubscribeById(Long sid) + { + return expSubscribeMapper.deleteExpSubscribeById(sid); + } +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpressInfoServiceImpl.java b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpressInfoServiceImpl.java new file mode 100644 index 000000000..0f7163412 --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpressInfoServiceImpl.java @@ -0,0 +1,259 @@ +package com.ruoyi.bps.service.impl; + +import com.ruoyi.bps.domain.ExpressInfo; +import com.ruoyi.bps.mapper.ExpressInfoMapper; +import com.ruoyi.bps.service.IExpressInfoService; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.StringUtils; +import com.google.gson.Gson; +import com.kuaidi100.sdk.api.AutoNum; +import com.kuaidi100.sdk.api.QueryTrack; +import com.kuaidi100.sdk.core.IBaseClient; +import com.kuaidi100.sdk.pojo.HttpResult; +import com.kuaidi100.sdk.request.AutoNumReq; +import com.kuaidi100.sdk.request.QueryTrackParam; +import com.kuaidi100.sdk.request.QueryTrackReq; +import com.kuaidi100.sdk.response.AutoNumResp; +import com.kuaidi100.sdk.response.QueryTrackData; +import com.kuaidi100.sdk.response.QueryTrackResp; +import com.kuaidi100.sdk.utils.PropertiesReader; +import com.kuaidi100.sdk.utils.SignUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * 快递信息Service业务层处理 + * + * @author box + * @date 2021-05-06 + */ +@Service +public class ExpressInfoServiceImpl implements IExpressInfoService +{ + /* + String key = "Jydbrxsm2311"; + String customer = "2DD48B3469B82F2B7700569093AB792B"; + String secret = "8781ed9b35a7438499eb02fee915915a"; + String userid = "2a62da2192c24d17a943ff78ee64f8c6"; + + */ + + String key = PropertiesReader.get("key"); + String customer = PropertiesReader.get("customer"); + String secret = PropertiesReader.get("secret"); + String siid = PropertiesReader.get("siid"); + String userid = PropertiesReader.get("userid"); + String tid = PropertiesReader.get("tid"); + String secret_key = PropertiesReader.get("secret_key"); + String secret_secret = PropertiesReader.get("secret_secret"); + + + + String msg=""; + + @Autowired + private ExpressInfoMapper expressInfoMapper; + + /** + * 查询快递信息 + * + * @param message 快递信息ID + * @return 快递信息 + */ + @Override + public ExpressInfo selectExpressInfoById(String message) + { + return expressInfoMapper.selectExpressInfoById(message); + } + + /** + * 查询快递信息列表 + * + * @param expressInfo 快递信息 + * @return 快递信息列表 + */ + @Override + public List selectExpressInfoList(ExpressInfo expressInfo) + { + List expressInfoList=new ArrayList<>(); + //如果没有输入订单号，则返回空信息 + String nuStr=expressInfo.getNu(); + if(StringUtils.isEmpty(nuStr)){ + expressInfo.setData("请输入订单号进行查询！"); + expressInfoList.add(expressInfo); + return expressInfoList; + } + //如果是顺丰，则必须要输入电话号码 + if( StringUtils.isEmpty(expressInfo.getPhone()) + && (expressInfo.getCom().equals("nsf") || expressInfo.getCom().contains("shunfeng"))){ + expressInfo.setData("查询顺丰快递信息，必须要提供收/寄人电话号码"); + expressInfoList.add(expressInfo); + return expressInfoList; + } + + List stringList= Arrays.asList(nuStr.split(",")); + ExpressInfo newExpressInfo= expressInfo; + for(String str:stringList){ + newExpressInfo.setNu(str); + expressInfoList.add(SelectExpressInfo(newExpressInfo)); + } + return expressInfoList; + //return expressInfoMapper.selectExpressInfoList(expressInfo); + } + + private ExpressInfo SelectExpressInfo(ExpressInfo expressInfo){ + String nu=expressInfo.getNu(); //快递单号 + String com=expressInfo.getCom(); //快递公司 + String phone=expressInfo.getPhone(); //收、寄件人电话号码 + ExpressInfo callbackExpressInfo=new ExpressInfo(); + + callbackExpressInfo.setNu(nu); + callbackExpressInfo.setPhone(phone); + //如果没有输入快递公司编号，则查询快递公司编号 + if(StringUtils.isEmpty(com)){ + if(AutoGetExpressCom(nu)==null){ + callbackExpressInfo.setData("根据快递单号查询不到快递公司，请确认快递单号是否正确！"); + return callbackExpressInfo; + } + com=AutoGetExpressCom(nu).getComCode(); + } + callbackExpressInfo.setCom(com); + + //return callbackExpressInfo; + return QueryExpressInfo(callbackExpressInfo); + } + + private ExpressInfo QueryExpressInfo(ExpressInfo expressInfo){ + //从expressInfo中获取快递单号、物流信息、电话,生成快递请求参数 + QueryTrackParam queryTrackParam= new QueryTrackParam(); + queryTrackParam.setNum(expressInfo.getNu()); + queryTrackParam.setCom(expressInfo.getCom()); + queryTrackParam.setPhone(expressInfo.getPhone()); + + //获取快递信息 + String param = new Gson().toJson(queryTrackParam); + QueryTrackReq queryTrackReq=new QueryTrackReq(); + queryTrackReq.setParam(param); + queryTrackReq.setCustomer(customer); + queryTrackReq.setSign(SignUtils.querySign(param ,key,customer)); + HttpResult httpResult =new HttpResult(); + IBaseClient baseClient = new QueryTrack(); + try { + httpResult = baseClient.execute(queryTrackReq); + msg=httpResult.getBody(); + } + catch (Exception e) { + msg=e.toString(); + } + + //将快递信息转化为QueryTrackResp对象 + QueryTrackResp queryTrackResp = new Gson().fromJson(msg,QueryTrackResp.class); + + //如果没有查到物流信息，则返回错误信息 + if(StringUtils.isEmpty(queryTrackResp.getStatus()) || !queryTrackResp.getStatus().equals("200")){ + expressInfo.setData(queryTrackResp.getMessage()); + return expressInfo; + } + + //将快递信息中的Context转化为字符 + String dataStr=""; + for(QueryTrackData queryTrackData :queryTrackResp.getData()){ + dataStr+="【"+queryTrackData.getTime()+"】 "; + dataStr+=queryTrackData.getContext(); + if(queryTrackResp.getData().size()-1>queryTrackResp.getData().indexOf(queryTrackData)){ + dataStr+="\r"; + } + } + ExpressInfo callbackExpressInfo=new ExpressInfo(); + callbackExpressInfo.setMessage(queryTrackResp.getMessage()); + callbackExpressInfo.setNu(queryTrackResp.getNu()); + callbackExpressInfo.setIscheck(queryTrackResp.getIscheck()); + callbackExpressInfo.setCom(queryTrackResp.getCom()); + callbackExpressInfo.setStatus(queryTrackResp.getStatus()); + callbackExpressInfo.setData(dataStr); + callbackExpressInfo.setState(queryTrackResp.getState()); + callbackExpressInfo.setCondition(queryTrackResp.getCondition()); + callbackExpressInfo.setRouteInfo(""); //出发位置，当前位置，到达位置，暂无信息 + callbackExpressInfo.setReturnCode(queryTrackResp.getReturnCode()); + callbackExpressInfo.setResult(queryTrackResp.isResult()?"Y":"N"); + callbackExpressInfo.setPhone(expressInfo.getPhone()); + + return callbackExpressInfo; + } + + /** + * 根据快递单号，查询快递公司编码 + * @param num 快递单号 + * @return 快递公司编码 + */ + + private AutoNumResp AutoGetExpressCom(String num){ + AutoNumReq autoNumReq = new AutoNumReq(); + autoNumReq.setKey(key); + autoNumReq.setNum(num); + + IBaseClient baseClient = new AutoNum(); + AutoNumResp autoNumResp=new AutoNumResp(); + try { + String str= baseClient.execute(autoNumReq).getBody().replace("[","").replace("]",""); + autoNumResp = new Gson().fromJson(str,AutoNumResp.class); + + } catch (Exception e) { + e.printStackTrace(); + } + return autoNumResp; + } + + /** + * 新增快递信息 + * + * @param expressInfo 快递信息 + * @return 结果 + */ + @Override + public int insertExpressInfo(ExpressInfo expressInfo) + { + return expressInfoMapper.insertExpressInfo(expressInfo); + } + + /** + * 修改快递信息 + * + * @param expressInfo 快递信息 + * @return 结果 + */ + @Override + public int updateExpressInfo(ExpressInfo expressInfo) + { + return expressInfoMapper.updateExpressInfo(expressInfo); + } + + /** + * 删除快递信息对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteExpressInfoByIds(String ids) + { + return expressInfoMapper.deleteExpressInfoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除快递信息信息 + * + * @param message 快递信息ID + * @return 结果 + */ + @Override + public int deleteExpressInfoById(String message) + { + return expressInfoMapper.deleteExpressInfoById(message); + } + +} diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpressServiceImpl.java b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpressServiceImpl.java new file mode 100644 index 000000000..05f8c7f7c --- /dev/null +++ b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpressServiceImpl.java @@ -0,0 +1,199 @@ +package com.ruoyi.bps.service.impl; + +//import com.ruoyi.bps.express.api.QueryTrack; +//import com.ruoyi.bps.express.api.Subscribe; +//import com.ruoyi.bps.express.contant.ApiInfoConstant; +//import com.ruoyi.bps.express.contant.CompanyConstant; +//import com.ruoyi.bps.express.core.IBaseClient; +//import com.ruoyi.bps.express.pojo.HttpResult; +//import com.ruoyi.bps.express.request.*; + +//import com.ruoyi.bps.express.response.QueryTrackResp; +//import com.ruoyi.bps.express.utils.PropertiesReader; +//import com.ruoyi.bps.express.utils.SignUtils; + +import com.google.gson.Gson; +import com.kuaidi100.sdk.api.QueryTrack; +import com.kuaidi100.sdk.api.Subscribe; +import com.kuaidi100.sdk.contant.ApiInfoConstant; +import com.kuaidi100.sdk.core.IBaseClient; +import com.kuaidi100.sdk.pojo.HttpResult; +import com.kuaidi100.sdk.request.*; +import com.kuaidi100.sdk.response.QueryTrackResp; +import com.kuaidi100.sdk.utils.PropertiesReader; +import com.kuaidi100.sdk.utils.SignUtils; +import com.ruoyi.bps.service.IExpressService; +import org.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class ExpressServiceImpl implements IExpressService { + /* + String key = "Jydbrxsm2311"; + String customer = "2DD48B3469B82F2B7700569093AB792B"; + String secret = "8781ed9b35a7438499eb02fee915915a"; + String userid = "2a62da2192c24d17a943ff78ee64f8c6"; + */ + String key = PropertiesReader.get("key"); + String customer = PropertiesReader.get("customer"); + String secret = PropertiesReader.get("secret"); + String siid = PropertiesReader.get("siid"); + String userid = PropertiesReader.get("userid"); + String tid = PropertiesReader.get("tid"); + String secret_key = PropertiesReader.get("secret_key"); + String secret_secret = PropertiesReader.get("secret_secret"); + String msg=""; + @Autowired + IExpressService expressService; + + @Override + public List QueryTrackExpressMultiList(List list) { + List qtList=new ArrayList<>(); + + for(QueryTrackParam queryTrackParam:list) + { + QueryTrackResp queryTrackResp = new Gson().fromJson(expressService.QueryTrackExpress(queryTrackParam),QueryTrackResp.class); + qtList.add(queryTrackResp); + } + return qtList; + } + + /** + *查询多个物流轨迹 + */ + @Override + public String QueryTrackExpressMulti(List list) { + String str=""; + for(QueryTrackParam qt:list){ + str += QueryTrackExpress(qt); + } + return str; + } + + /** + * 查询单个物流轨迹 + */ + @Override + public String QueryTrackExpress(QueryTrackParam queryTrackParam) { + String str=""; + QueryTrackReq queryTrackReq = new QueryTrackReq(); + String param = new Gson().toJson(queryTrackParam); + + queryTrackReq.setParam(param); + queryTrackReq.setCustomer(customer); + queryTrackReq.setSign(SignUtils.querySign(param ,key,customer)); + HttpResult httpResult=new HttpResult(); + IBaseClient baseClient = new QueryTrack(); + try { + httpResult = baseClient.execute(queryTrackReq); + msg=httpResult.getBody(); + } + catch (Exception e) { + msg=e.toString(); + } + + JSONObject jsonObject = new JSONObject(msg); + if (jsonObject.has("returnCode")){ + QueryTrackResp queryTrackResp= new Gson().fromJson(msg,QueryTrackResp.class); + queryTrackResp.setStatus(queryTrackResp.getReturnCode()); + queryTrackResp.setNu(queryTrackParam.getNum()); + msg= new Gson().toJson(queryTrackResp); + } + /* else { + QueryTrackResp queryTrackResp=new Gson().fromJson(msg,QueryTrackResp.class); + for(int i=0;i GetTestQueryTrackParam() { + QueryTrackParam queryTrackParam = new QueryTrackParam(); + List list=new ArrayList(); + queryTrackParam.setCom("annengwuliu"); + queryTrackParam.setNum("300445967949"); + queryTrackParam.setPhone("17725390266"); + list.add(queryTrackParam); + + QueryTrackParam queryTrackParam1 = new QueryTrackParam(); + queryTrackParam1.setCom("annengwuliu"); + queryTrackParam1.setNum("300445967135"); + queryTrackParam1.setPhone("17725390266"); + list.add(queryTrackParam1); + + + QueryTrackParam queryTrackParam2 = new QueryTrackParam(); + queryTrackParam2.setCom("annengwuliu"); + queryTrackParam2.setNum("3004459670971"); + queryTrackParam2.setPhone("17725390266"); + list.add(queryTrackParam2); +/* + QueryTrackParam queryTrackParam3 = new QueryTrackParam(); + queryTrackParam3.setCom(CompanyConstant.AN); + queryTrackParam3.setNum("300445967045"); + queryTrackParam3.setPhone("17725390266"); + list.add(queryTrackParam3); + + QueryTrackParam queryTrackParam4 = new QueryTrackParam(); + queryTrackParam4.setCom(CompanyConstant.AN); + queryTrackParam4.setNum("300443569920"); + queryTrackParam4.setPhone("17725390266"); + list.add(queryTrackParam4); + + QueryTrackParam queryTrackParam5 = new QueryTrackParam(); + queryTrackParam5.setCom(CompanyConstant.AN); + queryTrackParam5.setNum("300443569878"); + queryTrackParam5.setPhone("17725390266"); + list.add(queryTrackParam5); + + QueryTrackParam queryTrackParam6 = new QueryTrackParam(); + queryTrackParam6.setCom(CompanyConstant.AN); + queryTrackParam6.setNum("300443569880"); + queryTrackParam6.setPhone("17725390266"); + list.add(queryTrackParam6); + */ + return list; + } + + +} diff --git a/box-bps/src/main/resources/account.properties b/box-bps/src/main/resources/account.properties new file mode 100644 index 000000000..c7f7dc6a0 --- /dev/null +++ b/box-bps/src/main/resources/account.properties @@ -0,0 +1,25 @@ +#快递100的基础账号信息，可以在这里获取 +# https://poll.kuaidi100.com/manager/page/myinfo/enterprise +key = Jydbrxsm2311 +customer = 2DD48B3469B82F2B7700569093AB792B +secret = 8781ed9b35a7438499eb02fee915915a +userid = 2a62da2192c24d17a943ff78ee64f8c6 + +#电子面单快递公司账号信息（非必填） +partnerId = +partnerKey = +net = +siid = + +#短信模板id（非必填） +tid = + +#云平台相关（非必填） +#登录云平台 https://cloud.kuaidi100.com/buyer/user/info +secret_key = +secret_secret = + +#是否记录快递100接口返回结果，建议记录日志或者入库，方便后期有问题双方排查（true:启用 false: 关闭 ） +log.return.record = true +#日志记录位置，建议根据自身情况配置 +logPath = logs \ No newline at end of file diff --git a/box-bps/src/main/resources/mapper/bps/ExpSubsPushRespMapper.xml b/box-bps/src/main/resources/mapper/bps/ExpSubsPushRespMapper.xml new file mode 100644 index 000000000..0c10253a7 --- /dev/null +++ b/box-bps/src/main/resources/mapper/bps/ExpSubsPushRespMapper.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select sid, status, billStatus, message, autoCheck, comOld, comNew, lastResultMessage, lastResultState, lastResulStatus, lastResultCondition, lastResultIsCheck, lastResultCom, lastResultNu, lastResultData, destResultMessage, destResultState, destResultStatus, destResultCondition, destResultIsCheck, destResultCom, destResultNu, destResultData from exp_subs_push_resp + + + + + + + + insert into exp_subs_push_resp + + status, + billStatus, + message, + autoCheck, + comOld, + comNew, + lastResultMessage, + lastResultState, + lastResulStatus, + lastResultCondition, + lastResultIsCheck, + lastResultCom, + lastResultNu, + lastResultData, + destResultMessage, + destResultState, + destResultStatus, + destResultCondition, + destResultIsCheck, + destResultCom, + destResultNu, + destResultData, + + + #{status}, + #{billStatus}, + #{message}, + #{autoCheck}, + #{comOld}, + #{comNew}, + #{lastResultMessage}, + #{lastResultState}, + #{lastResulStatus}, + #{lastResultCondition}, + #{lastResultIsCheck}, + #{lastResultCom}, + #{lastResultNu}, + #{lastResultData}, + #{destResultMessage}, + #{destResultState}, + #{destResultStatus}, + #{destResultCondition}, + #{destResultIsCheck}, + #{destResultCom}, + #{destResultNu}, + #{destResultData}, + + + + + update exp_subs_push_resp + + status = #{status}, + billStatus = #{billStatus}, + message = #{message}, + autoCheck = #{autoCheck}, + comOld = #{comOld}, + comNew = #{comNew}, + lastResultMessage = #{lastResultMessage}, + lastResultState = #{lastResultState}, + lastResulStatus = #{lastResulStatus}, + lastResultCondition = #{lastResultCondition}, + lastResultIsCheck = #{lastResultIsCheck}, + lastResultCom = #{lastResultCom}, + lastResultNu = #{lastResultNu}, + lastResultData = #{lastResultData}, + destResultMessage = #{destResultMessage}, + destResultState = #{destResultState}, + destResultStatus = #{destResultStatus}, + destResultCondition = #{destResultCondition}, + destResultIsCheck = #{destResultIsCheck}, + destResultCom = #{destResultCom}, + destResultNu = #{destResultNu}, + destResultData = #{destResultData}, + + where sid = #{sid} + + + + delete from exp_subs_push_resp where sid = #{sid} + + + + delete from exp_subs_push_resp where sid in + + #{sid} + + + + \ No newline at end of file diff --git a/box-bps/src/main/resources/mapper/bps/ExpSubscribeMapper.xml b/box-bps/src/main/resources/mapper/bps/ExpSubscribeMapper.xml new file mode 100644 index 000000000..a6c166466 --- /dev/null +++ b/box-bps/src/main/resources/mapper/bps/ExpSubscribeMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + select sid, company, number, phone, salt, subscribeTime, result, returnCode, message from exp_subscribe + + + + + + + + insert into exp_subscribe + + company, + number, + phone, + salt, + subscribeTime, + result, + returnCode, + message, + + + #{company}, + #{number}, + #{phone}, + #{salt}, + #{subscribeTime}, + #{result}, + #{returnCode}, + #{message}, + + + + + update exp_subscribe + + company = #{company}, + number = #{number}, + phone = #{phone}, + salt = #{salt}, + subscribeTime = #{subscribeTime}, + result = #{result}, + returnCode = #{returnCode}, + message = #{message}, + + where sid = #{sid} + + + + delete from exp_subscribe where sid = #{sid} + + + + delete from exp_subscribe where sid in + + #{sid} + + + + \ No newline at end of file diff --git a/box-bps/src/main/resources/mapper/bps/ExpressInfoMapper.xml b/box-bps/src/main/resources/mapper/bps/ExpressInfoMapper.xml new file mode 100644 index 000000000..57682de91 --- /dev/null +++ b/box-bps/src/main/resources/mapper/bps/ExpressInfoMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + select message, nu, ischeck, com, status, data, state, condition, routeInfo, returnCode, result, phone from expressInfo + + + + + + + + insert into expressInfo + + message, + nu, + ischeck, + com, + status, + data, + state, + condition, + routeInfo, + returnCode, + result, + phone, + + + #{message}, + #{nu}, + #{ischeck}, + #{com}, + #{status}, + #{data}, + #{state}, + #{condition}, + #{routeInfo}, + #{returnCode}, + #{result}, + #{phone}, + + + + + update expressInfo + + nu = #{nu}, + ischeck = #{ischeck}, + com = #{com}, + status = #{status}, + data = #{data}, + state = #{state}, + condition = #{condition}, + routeInfo = #{routeInfo}, + returnCode = #{returnCode}, + result = #{result}, + phone = #{phone}, + + where message = #{message} + + + + delete from expressInfo where message = #{message} + + + + delete from expressInfo where message in + + #{message} + + + + \ No newline at end of file diff --git a/box-bps/src/main/resources/mapper/bps/TopgpDdlMapper.xml b/box-bps/src/main/resources/mapper/bps/TopgpDdlMapper.xml new file mode 100644 index 000000000..553117013 --- /dev/null +++ b/box-bps/src/main/resources/mapper/bps/TopgpDdlMapper.xml @@ -0,0 +1,29 @@ + + + + + + alter table ${originalTableName} rename ${newTableName} + + + + truncate table ${tableName} + + + + drop table ${tableName} + + + + create table ${newTableName} as select * from ${originalTableName} + + + + + + + \ No newline at end of file diff --git a/box-bps/src/main/resources/templates/bps/expressInfo/add.html b/box-bps/src/main/resources/templates/bps/expressInfo/add.html new file mode 100644 index 000000000..7a2c96f55 --- /dev/null +++ b/box-bps/src/main/resources/templates/bps/expressInfo/add.html @@ -0,0 +1,97 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/box-bps/src/main/resources/templates/bps/expressInfo/edit.html b/box-bps/src/main/resources/templates/bps/expressInfo/edit.html new file mode 100644 index 000000000..909109769 --- /dev/null +++ b/box-bps/src/main/resources/templates/bps/expressInfo/edit.html @@ -0,0 +1,98 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/box-bps/src/main/resources/templates/bps/expressInfo/expressInfo.html b/box-bps/src/main/resources/templates/bps/expressInfo/expressInfo.html new file mode 100644 index 000000000..183543dfd --- /dev/null +++ b/box-bps/src/main/resources/templates/bps/expressInfo/expressInfo.html @@ -0,0 +1,145 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/box-bps/src/main/resources/templates/bps/expsubspushresp/add.html b/box-bps/src/main/resources/templates/bps/expsubspushresp/add.html new file mode 100644 index 000000000..111562c1d --- /dev/null +++ b/box-bps/src/main/resources/templates/bps/expsubspushresp/add.html @@ -0,0 +1,169 @@ + + + + + + +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/box-bps/src/main/resources/templates/bps/expsubspushresp/edit.html b/box-bps/src/main/resources/templates/bps/expsubspushresp/edit.html new file mode 100644 index 000000000..b4a69065b --- /dev/null +++ b/box-bps/src/main/resources/templates/bps/expsubspushresp/edit.html @@ -0,0 +1,170 @@ + + + + + + +
+
+ +
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html b/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html new file mode 100644 index 000000000..5e89e3450 --- /dev/null +++ b/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html @@ -0,0 +1,237 @@ + + + + + + +
+
+
+
+
+
    + + + +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • + +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/box-bps/src/main/resources/templates/bps/subscribe/add.html b/box-bps/src/main/resources/templates/bps/subscribe/add.html new file mode 100644 index 000000000..602e167c3 --- /dev/null +++ b/box-bps/src/main/resources/templates/bps/subscribe/add.html @@ -0,0 +1,75 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/box-bps/src/main/resources/templates/bps/subscribe/edit.html b/box-bps/src/main/resources/templates/bps/subscribe/edit.html new file mode 100644 index 000000000..035677c9d --- /dev/null +++ b/box-bps/src/main/resources/templates/bps/subscribe/edit.html @@ -0,0 +1,76 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html b/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html new file mode 100644 index 000000000..d7252dad0 --- /dev/null +++ b/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html @@ -0,0 +1,169 @@ + + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
  • +  订阅 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/box-bps/src/main/resources/templates/express/queryExpress.html b/box-bps/src/main/resources/templates/express/queryExpress.html new file mode 100644 index 000000000..2b6bb25ca --- /dev/null +++ b/box-bps/src/main/resources/templates/express/queryExpress.html @@ -0,0 +1,98 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/box-test/pom.xml b/box-test/pom.xml new file mode 100644 index 000000000..d606da50d --- /dev/null +++ b/box-test/pom.xml @@ -0,0 +1,28 @@ + + + + ruoyi + com.ruoyi + 4.6.1 + + 4.0.0 + + box-test + + + test系统模块 + + + + + + + com.ruoyi + ruoyi-common + + + + + \ No newline at end of file diff --git a/box-test/src/main/java/com/ruoyi/test/conrtroller/ApiController.java b/box-test/src/main/java/com/ruoyi/test/conrtroller/ApiController.java new file mode 100644 index 000000000..e3a4c9f77 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/conrtroller/ApiController.java @@ -0,0 +1,61 @@ +package com.ruoyi.test.conrtroller; + +import com.ruoyi.common.core.domain.AjaxResult; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.authz.annotation.RequiresRoles; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * + * 测试权限登录访问请求 + * + * 登录访问（返回token） POST / http://localhost:80/jwt/login?username=ry&password=admin123 + * + * 测试任意权限（header携带token） GET / http://localhost:80/api/list + * + * 测试菜单权限（header携带token） GET / http://localhost:80/api/user/list + * + * 测试角色权限（header携带token） GET / http://localhost:80/api/role/list + * + */ + + + +@RestController +@RequestMapping("/api") +public class ApiController +{ + /** + * 无权限访问 + * + * @return + */ + @GetMapping("/list") + public AjaxResult list() + { + return AjaxResult.success("list success"); + } + + /** + * 菜单权限 system:user:list + */ + @GetMapping("/user/list") + @RequiresPermissions("system:user:list") + public AjaxResult userlist() + { + return AjaxResult.success("user list success"); + } + + /** + * 角色权限 admin + */ + @GetMapping("/role/list") + @RequiresRoles("admin") + public AjaxResult rolelist() + { + return AjaxResult.success("role list success"); + } +} \ No newline at end of file diff --git a/box-test/src/main/java/com/ruoyi/test/conrtroller/BoxTestController.java b/box-test/src/main/java/com/ruoyi/test/conrtroller/BoxTestController.java new file mode 100644 index 000000000..f282d9344 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/conrtroller/BoxTestController.java @@ -0,0 +1,18 @@ +package com.ruoyi.test.conrtroller; + +import com.ruoyi.test.service.TestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/test") +public class BoxTestController { + @Autowired + private TestService testService; + @RequestMapping("test") + public String test(){ + testService.test(); + return testService.test(); + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/conrtroller/FrForCrController.java b/box-test/src/main/java/com/ruoyi/test/conrtroller/FrForCrController.java new file mode 100644 index 000000000..29915a5e8 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/conrtroller/FrForCrController.java @@ -0,0 +1,45 @@ +package com.ruoyi.test.conrtroller; + +import com.ruoyi.test.service.OracleDdlService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.time.LocalTime; +import java.util.Map; + +@RestController +public class FrForCrController { + @Autowired + private OracleDdlService oracleDdlService; + + @CrossOrigin + @RequestMapping("/test/frforcr") + public void frforcr(@RequestBody Map map){ + for(Object value:map.values()){ + String dbName="ds7"; + String tableName=value.toString(); + String tableNameWithDb=dbName+"."+tableName; + int isTableInDb=oracleDdlService.isTableInDb(dbName,tableName); + if(isTableInDb>0){ + try{ + oracleDdlService.dropTable(tableNameWithDb); + System.out.println(LocalTime.now()+"【"+tableNameWithDb+"】已被删除！"); + }catch (Exception e){ + System.out.println(LocalTime.now()+"【"+tableNameWithDb+"】删除异常！"); + } + } + else{ + System.out.println(LocalTime.now()+"【"+tableNameWithDb+"】不存在！"); + } + } + + } + + + +} + + diff --git a/box-test/src/main/java/com/ruoyi/test/conrtroller/GetJsonReqController.java b/box-test/src/main/java/com/ruoyi/test/conrtroller/GetJsonReqController.java new file mode 100644 index 000000000..e5ad72c9e --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/conrtroller/GetJsonReqController.java @@ -0,0 +1,67 @@ +package com.ruoyi.test.conrtroller; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.test.domain.Beauty; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +@RestController +@RequestMapping("/test") +public class GetJsonReqController { + + @CrossOrigin + @RequestMapping(value = "simple") + // json的结构和内部字段名称可以与POJO/DTO/javabean完全对应 + public Map getJsonBean(@RequestBody Beauty beauty) { + Map result = null; + + if (beauty != null) { + System.out.println("姓名：" + beauty.getName()); + System.out.println("年龄：" + beauty.getAge()); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + System.out.println("出生日期：" + sdf.format(beauty.getDate())); + + System.out.println("年收入：" + beauty.getSalary()); + result = new HashMap<>(); + result.put("code", "1"); + result.put("msg", "ok"); + } + + return result; + } + + @CrossOrigin + @RequestMapping(value = "complex") + //json的结构较为复杂，不直接与POJO/DTO/javabean对应。 + public Map getJsonComplex(@RequestBody JSONObject param) { + Map result = null; + + if (param != null) { + JSONObject master = param.getJSONObject("master"); + Beauty beauty = (Beauty) JSONObject.toJavaObject(master, Beauty.class); + System.out.println(beauty); + + JSONArray mm = param.getJSONArray("MM"); + for (int i = 0; i < mm.size(); i++) { + // 这里不能使用get(i)，因为get(i)只会得到键值对。 + JSONObject json = mm.getJSONObject(i); + Beauty bt = (Beauty) JSONObject.toJavaObject(json, Beauty.class); + System.out.println(bt); + } + + result = new HashMap<>(); + result.put("code", "1"); + result.put("msg", "ok"); + } + + return result; + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/conrtroller/OracleDdlController.java b/box-test/src/main/java/com/ruoyi/test/conrtroller/OracleDdlController.java new file mode 100644 index 000000000..5f0b67f56 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/conrtroller/OracleDdlController.java @@ -0,0 +1,55 @@ +package com.ruoyi.test.conrtroller; + +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.test.service.OracleDdlService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/test") +@DataSource(value = DataSourceType.SLAVE) +public class OracleDdlController { + @Autowired + private OracleDdlService oracleDdlService; + + //查询表录数 + @RequestMapping("getRecordCount") + + public String getRecordCount() { + String tableName = "tc_user"; + int result = oracleDdlService.getRecordCount(tableName); + return result + ""; + } + + //检查表是否存在 + @RequestMapping("isTableInDb") + public String isTableInDb() { + String dbName = "ds7"; + String tableName = "tc_user"; + return (oracleDdlService.isTableInDb(dbName, tableName)>0?"实例ds7中存在表tc_user":"实例ds7中不存在表tc_user"); + } + + //复制表 + @RequestMapping("copyTable") + public String copyTable() { + String originalTalble = "tc_user"; + String newTable = "new_tc_user"; + + if (oracleDdlService.isTableInDb("ds7", originalTalble) > 0) { + try { + oracleDdlService.copyTable(newTable, originalTalble); + return "复制" + originalTalble + "成功！新表名：" + newTable; + } catch (Exception e) { + System.out.println(e); + return "复制" + originalTalble + "失败！"; + } + } else { + return "表"+originalTalble+"不存在"; + + } + + } + +} diff --git a/box-test/src/main/java/com/ruoyi/test/conrtroller/SendJsonController.java b/box-test/src/main/java/com/ruoyi/test/conrtroller/SendJsonController.java new file mode 100644 index 000000000..689d2ce84 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/conrtroller/SendJsonController.java @@ -0,0 +1,15 @@ +package com.ruoyi.test.conrtroller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + + +@Controller +public class SendJsonController { + @RequestMapping("/test/sendjson") + public String ajaxSend(){ + return ("test/sendJson"); + + } + +} diff --git a/box-test/src/main/java/com/ruoyi/test/conrtroller/SysCustomerController.java b/box-test/src/main/java/com/ruoyi/test/conrtroller/SysCustomerController.java new file mode 100644 index 000000000..9e4b8e568 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/conrtroller/SysCustomerController.java @@ -0,0 +1,123 @@ +package com.ruoyi.test.conrtroller; + +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.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.test.domain.SysCustomer; +import com.ruoyi.test.service.ISysCustomerService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 客户Controller + * + * @author box + * @date 2021-02-13 + */ +@Controller +@RequestMapping("/test/customer") +public class SysCustomerController extends BaseController +{ + private String prefix = "test/customer"; + + @Autowired + private ISysCustomerService sysCustomerService; + + @RequiresPermissions("test:customer:view") + @GetMapping() + public String customer() + { + return prefix + "/customer"; + } + + /** + * 查询客户列表 + */ + @RequiresPermissions("test:customer:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SysCustomer sysCustomer) + { + startPage(); + List list = sysCustomerService.selectSysCustomerList(sysCustomer); + return getDataTable(list); + } + + /** + * 导出客户列表 + */ + @RequiresPermissions("test:customer:export") + @Log(title = "客户", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(SysCustomer sysCustomer) + { + List list = sysCustomerService.selectSysCustomerList(sysCustomer); + ExcelUtil util = new ExcelUtil(SysCustomer.class); + return util.exportExcel(list, "customer"); + } + + /** + * 新增客户 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存客户 + */ + @RequiresPermissions("test:customer:add") + @Log(title = "客户", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(SysCustomer sysCustomer) + { + return toAjax(sysCustomerService.insertSysCustomer(sysCustomer)); + } + + /** + * 修改客户 + */ + @GetMapping("/edit/{customerId}") + public String edit(@PathVariable("customerId") Long customerId, ModelMap mmap) + { + SysCustomer sysCustomer = sysCustomerService.selectSysCustomerById(customerId); + mmap.put("sysCustomer", sysCustomer); + return prefix + "/edit"; + } + + /** + * 修改保存客户 + */ + @RequiresPermissions("test:customer:edit") + @Log(title = "客户", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(SysCustomer sysCustomer) + { + return toAjax(sysCustomerService.updateSysCustomer(sysCustomer)); + } + + /** + * 删除客户 + */ + @RequiresPermissions("test:customer:remove") + @Log(title = "客户", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(sysCustomerService.deleteSysCustomerByIds(ids)); + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/conrtroller/SysFileInfoController.java b/box-test/src/main/java/com/ruoyi/test/conrtroller/SysFileInfoController.java new file mode 100644 index 000000000..e7a610ef5 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/conrtroller/SysFileInfoController.java @@ -0,0 +1,123 @@ +package com.ruoyi.test.conrtroller; + +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.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.test.domain.SysFileInfo; +import com.ruoyi.test.service.ISysFileInfoService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 文件信息Controller + * + * @author box + * @date 2021-05-06 + */ +@Controller +@RequestMapping("/test/fileinfo") +public class SysFileInfoController extends BaseController +{ + private String prefix = "test/fileinfo"; + + @Autowired + private ISysFileInfoService sysFileInfoService; + + @RequiresPermissions("test:fileinfo:view") + @GetMapping() + public String fileinfo() + { + return prefix + "/fileinfo"; + } + + /** + * 查询文件信息列表 + */ + @RequiresPermissions("test:fileinfo:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SysFileInfo sysFileInfo) + { + startPage(); + List list = sysFileInfoService.selectSysFileInfoList(sysFileInfo); + return getDataTable(list); + } + + /** + * 导出文件信息列表 + */ + @RequiresPermissions("test:fileinfo:export") + @Log(title = "文件信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(SysFileInfo sysFileInfo) + { + List list = sysFileInfoService.selectSysFileInfoList(sysFileInfo); + ExcelUtil util = new ExcelUtil(SysFileInfo.class); + return util.exportExcel(list, "文件信息数据"); + } + + /** + * 新增文件信息 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存文件信息 + */ + @RequiresPermissions("test:fileinfo:add") + @Log(title = "文件信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(SysFileInfo sysFileInfo) + { + return toAjax(sysFileInfoService.insertSysFileInfo(sysFileInfo)); + } + + /** + * 修改文件信息 + */ + @GetMapping("/edit/{fileId}") + public String edit(@PathVariable("fileId") Long fileId, ModelMap mmap) + { + SysFileInfo sysFileInfo = sysFileInfoService.selectSysFileInfoById(fileId); + mmap.put("sysFileInfo", sysFileInfo); + return prefix + "/edit"; + } + + /** + * 修改保存文件信息 + */ + @RequiresPermissions("test:fileinfo:edit") + @Log(title = "文件信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(SysFileInfo sysFileInfo) + { + return toAjax(sysFileInfoService.updateSysFileInfo(sysFileInfo)); + } + + /** + * 删除文件信息 + */ + @RequiresPermissions("test:fileinfo:remove") + @Log(title = "文件信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(sysFileInfoService.deleteSysFileInfoByIds(ids)); + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/conrtroller/TcUserController.java b/box-test/src/main/java/com/ruoyi/test/conrtroller/TcUserController.java new file mode 100644 index 000000000..55953e6fc --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/conrtroller/TcUserController.java @@ -0,0 +1,64 @@ +package com.ruoyi.test.conrtroller; + +import com.ruoyi.test.domain.TcUser; +import com.ruoyi.test.service.TcUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/test") +public class TcUserController { + @Autowired + private TcUserService tcUserService; + + //查询所有 + // http://localhost/test/selectall + @RequestMapping("selectAll") + @ResponseBody + public String selectAll(){ + List users=tcUserService.selectAll(); + users.forEach(System.out::println); + return users.toString()+""; + } + + + //查询 by id + // http://localhost/test/selectById/1(此处1为要获取的id） + @RequestMapping(value = "selectById/{id}", method = RequestMethod.GET) + public String selectById(@PathVariable int id) { + return tcUserService.selectById(id).toString(); + } + + //插入新用户 + // http://localhost/test/insert?id=100&name=张三&password=20 + @RequestMapping(value = "/insert", method = RequestMethod.GET) + public TcUser insert(TcUser tcUser) { + return tcUserService.insert(tcUser); + } + + //通过用户id删除用户 + // http://localhost/test/deleteById?id=1(此处1为要删除的id） + @RequestMapping(value = "/deleteById", method = RequestMethod.GET) + public String delete(int id) { + int result = tcUserService.deleteById(id); + if (result >= 1) { + return "删除成功"; + } else { + return "删除失败"; + } + } + + //更新 by id + // http://localhost/test/updateById?id=2&name=波波&password=12 + @RequestMapping(value = "/updateById", method = RequestMethod.GET) + public String update(TcUser tcUser) { + int result = tcUserService.updateById(tcUser); + if (result >= 1) { + return "修改成功"; + } else { + return "修改失败"; + } + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/conrtroller/TestIndexController.java b/box-test/src/main/java/com/ruoyi/test/conrtroller/TestIndexController.java new file mode 100644 index 000000000..4900631cc --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/conrtroller/TestIndexController.java @@ -0,0 +1,16 @@ +package com.ruoyi.test.conrtroller; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.time.LocalDateTime; + +@Controller +public class TestIndexController { + @RequestMapping("/test") + public String index(ModelMap modelMap){ + modelMap.put("date", LocalDateTime.now()); + return ("test/index"); + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/conrtroller/TestVerifyController.java b/box-test/src/main/java/com/ruoyi/test/conrtroller/TestVerifyController.java new file mode 100644 index 000000000..f2d3c63f1 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/conrtroller/TestVerifyController.java @@ -0,0 +1,34 @@ +package com.ruoyi.test.conrtroller; + +import com.ruoyi.test.service.TestVerifyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +@Controller +public class TestVerifyController { + @Autowired + private TestVerifyService testVerifyService; + + @RequestMapping("/test/testVerify") + public String testVerify(){ + return "/test/testVerify"; + } + + + + + /** + * 校验用户名 + */ + + @PostMapping("/test/testVerifyName") + @ResponseBody + public int testVerifyName(String name) + { + return testVerifyService.isNameUnique(name); + } + +} diff --git a/box-test/src/main/java/com/ruoyi/test/domain/Beauty.java b/box-test/src/main/java/com/ruoyi/test/domain/Beauty.java new file mode 100644 index 000000000..41c2ec760 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/domain/Beauty.java @@ -0,0 +1,55 @@ +package com.ruoyi.test.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +public class Beauty { + private String name; + private int age; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date date; + private double salary; + + public Beauty() { + + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public double getSalary() { + return salary; + } + + public void setSalary(double salary) { + this.salary = salary; + } + + @Override + public String toString() { + return "Beauty [name=" + name + ", age=" + age + ", date=" + date + ", salary=" + salary + "]"; + } + +} diff --git a/box-test/src/main/java/com/ruoyi/test/domain/SysCustomer.java b/box-test/src/main/java/com/ruoyi/test/domain/SysCustomer.java new file mode 100644 index 000000000..0f34bbe05 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/domain/SysCustomer.java @@ -0,0 +1,113 @@ +package com.ruoyi.test.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; +import java.util.List; + +/** + * 客户对象 sys_customer + * + * @author box + * @date 2021-02-13 + */ +public class SysCustomer extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 客户id */ + private Long customerId; + + /** 客户姓名 */ + @Excel(name = "客户姓名") + private String customerName; + + /** 手机号码 */ + @Excel(name = "手机号码") + private String phonenumber; + + /** 客户性别 */ + @Excel(name = "客户性别") + private String sex; + + /** 客户生日 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "客户生日", width = 30, dateFormat = "yyyy-MM-dd") + private Date birthday; + + /** 商品信息 */ + private List sysGoodsList; + + public void setCustomerId(Long customerId) + { + this.customerId = customerId; + } + + public Long getCustomerId() + { + return customerId; + } + public void setCustomerName(String customerName) + { + this.customerName = customerName; + } + + public String getCustomerName() + { + return customerName; + } + public void setPhonenumber(String phonenumber) + { + this.phonenumber = phonenumber; + } + + public String getPhonenumber() + { + return phonenumber; + } + public void setSex(String sex) + { + this.sex = sex; + } + + public String getSex() + { + return sex; + } + public void setBirthday(Date birthday) + { + this.birthday = birthday; + } + + public Date getBirthday() + { + return birthday; + } + + public List getSysGoodsList() + { + return sysGoodsList; + } + + public void setSysGoodsList(List sysGoodsList) + { + this.sysGoodsList = sysGoodsList; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("customerId", getCustomerId()) + .append("customerName", getCustomerName()) + .append("phonenumber", getPhonenumber()) + .append("sex", getSex()) + .append("birthday", getBirthday()) + .append("remark", getRemark()) + .append("sysGoodsList", getSysGoodsList()) + .toString(); + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/domain/SysFileInfo.java b/box-test/src/main/java/com/ruoyi/test/domain/SysFileInfo.java new file mode 100644 index 000000000..003c5f57a --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/domain/SysFileInfo.java @@ -0,0 +1,65 @@ +package com.ruoyi.test.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 文件信息对象 sys_file_info + * + * @author box + * @date 2021-05-06 + */ +public class SysFileInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 文件id */ + private Long fileId; + + /** 文件名称 */ + @Excel(name = "文件名称") + private String fileName; + + /** 文件路径 */ + @Excel(name = "文件路径") + private String filePath; + + public void setFileId(Long fileId) + { + this.fileId = fileId; + } + + public Long getFileId() + { + return fileId; + } + public void setFileName(String fileName) + { + this.fileName = fileName; + } + + public String getFileName() + { + return fileName; + } + public void setFilePath(String filePath) + { + this.filePath = filePath; + } + + public String getFilePath() + { + return filePath; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("fileId", getFileId()) + .append("fileName", getFileName()) + .append("filePath", getFilePath()) + .toString(); + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/domain/SysGoods.java b/box-test/src/main/java/com/ruoyi/test/domain/SysGoods.java new file mode 100644 index 000000000..85740959a --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/domain/SysGoods.java @@ -0,0 +1,124 @@ +package com.ruoyi.test.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 商品对象 sys_goods + * + * @author box + * @date 2021-02-13 + */ +public class SysGoods extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 商品id */ + private Long goodsId; + + /** 客户id */ + @Excel(name = "客户id") + private Long customerId; + + /** 商品名称 */ + @Excel(name = "商品名称") + private String name; + + /** 商品重量 */ + @Excel(name = "商品重量") + private Integer weight; + + /** 商品价格 */ + @Excel(name = "商品价格") + private BigDecimal price; + + /** 商品时间 */ + @Excel(name = "商品时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date date; + + /** 商品种类 */ + @Excel(name = "商品种类") + private String type; + + public void setGoodsId(Long goodsId) + { + this.goodsId = goodsId; + } + + public Long getGoodsId() + { + return goodsId; + } + public void setCustomerId(Long customerId) + { + this.customerId = customerId; + } + + public Long getCustomerId() + { + return customerId; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setWeight(Integer weight) + { + this.weight = weight; + } + + public Integer getWeight() + { + return weight; + } + public void setPrice(BigDecimal price) + { + this.price = price; + } + + public BigDecimal getPrice() + { + return price; + } + public void setDate(Date date) + { + this.date = date; + } + + public Date getDate() + { + return date; + } + public void setType(String type) + { + this.type = type; + } + + public String getType() + { + return type; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("goodsId", getGoodsId()) + .append("customerId", getCustomerId()) + .append("name", getName()) + .append("weight", getWeight()) + .append("price", getPrice()) + .append("date", getDate()) + .append("type", getType()) + .toString(); + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/domain/TcUser.java b/box-test/src/main/java/com/ruoyi/test/domain/TcUser.java new file mode 100644 index 000000000..da8a2d3cc --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/domain/TcUser.java @@ -0,0 +1,40 @@ +package com.ruoyi.test.domain; + +public class TcUser { + private int id; + private String name; + private String password; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Override + public String toString() { + return "TcUser{" + + "id=" + id + + ", name='" + name + '\'' + + ", age='" + password + '\'' + + '}'; + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/mapper/OracleDdlMapper.java b/box-test/src/main/java/com/ruoyi/test/mapper/OracleDdlMapper.java new file mode 100644 index 000000000..e7c2f3a16 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/mapper/OracleDdlMapper.java @@ -0,0 +1,32 @@ +package com.ruoyi.test.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; + +@Mapper +@Component("OracleDdlMapper") +public interface OracleDdlMapper { + // alter table + int alterTableName(@Param("originalTableName") String originalTableName, + @Param("newTableName") String newTableName); + + //truncate table + int truncateTable(@Param("tableName") String tableName); + + //drop table + int dropTable(@Param("tableName") String tableName); + + //copy table + void copyTable(@Param("newTableName") String newTableName, + @Param("originalTableName") String originalTableName); + + //获取表记录数 + int getRecordCount(@Param("tableName") String tableName); + + + + //查询数据库中表是否存在 + int isTableInDb(@Param("dataBaseName") String dataBaseName, + @Param("tableName") String tableName); +} diff --git a/box-test/src/main/java/com/ruoyi/test/mapper/SysCustomerMapper.java b/box-test/src/main/java/com/ruoyi/test/mapper/SysCustomerMapper.java new file mode 100644 index 000000000..3ae177354 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/mapper/SysCustomerMapper.java @@ -0,0 +1,88 @@ +package com.ruoyi.test.mapper; + +import com.ruoyi.test.domain.SysCustomer; +import com.ruoyi.test.domain.SysGoods; + +import java.util.List; + +/** + * 客户Mapper接口 + * + * @author box + * @date 2021-02-13 + */ +public interface SysCustomerMapper +{ + /** + * 查询客户 + * + * @param customerId 客户ID + * @return 客户 + */ + public SysCustomer selectSysCustomerById(Long customerId); + + /** + * 查询客户列表 + * + * @param sysCustomer 客户 + * @return 客户集合 + */ + public List selectSysCustomerList(SysCustomer sysCustomer); + + /** + * 新增客户 + * + * @param sysCustomer 客户 + * @return 结果 + */ + public int insertSysCustomer(SysCustomer sysCustomer); + + /** + * 修改客户 + * + * @param sysCustomer 客户 + * @return 结果 + */ + public int updateSysCustomer(SysCustomer sysCustomer); + + /** + * 删除客户 + * + * @param customerId 客户ID + * @return 结果 + */ + public int deleteSysCustomerById(Long customerId); + + /** + * 批量删除客户 + * + * @param customerIds 需要删除的数据ID + * @return 结果 + */ + public int deleteSysCustomerByIds(String[] customerIds); + + /** + * 批量删除商品 + * + * @param customerIds 需要删除的数据ID + * @return 结果 + */ + public int deleteSysGoodsByCustomerIds(String[] customerIds); + + /** + * 批量新增商品 + * + * @param sysGoodsList 商品列表 + * @return 结果 + */ + public int batchSysGoods(List sysGoodsList); + + + /** + * 通过客户ID删除商品信息 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteSysGoodsByCustomerId(Long customerId); +} diff --git a/box-test/src/main/java/com/ruoyi/test/mapper/SysFileInfoMapper.java b/box-test/src/main/java/com/ruoyi/test/mapper/SysFileInfoMapper.java new file mode 100644 index 000000000..923f598cf --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/mapper/SysFileInfoMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.test.mapper; + +import com.ruoyi.test.domain.SysFileInfo; + +import java.util.List; + +/** + * 文件信息Mapper接口 + * + * @author box + * @date 2021-05-06 + */ +public interface SysFileInfoMapper +{ + /** + * 查询文件信息 + * + * @param fileId 文件信息ID + * @return 文件信息 + */ + public SysFileInfo selectSysFileInfoById(Long fileId); + + /** + * 查询文件信息列表 + * + * @param sysFileInfo 文件信息 + * @return 文件信息集合 + */ + public List selectSysFileInfoList(SysFileInfo sysFileInfo); + + /** + * 新增文件信息 + * + * @param sysFileInfo 文件信息 + * @return 结果 + */ + public int insertSysFileInfo(SysFileInfo sysFileInfo); + + /** + * 修改文件信息 + * + * @param sysFileInfo 文件信息 + * @return 结果 + */ + public int updateSysFileInfo(SysFileInfo sysFileInfo); + + /** + * 删除文件信息 + * + * @param fileId 文件信息ID + * @return 结果 + */ + public int deleteSysFileInfoById(Long fileId); + + /** + * 批量删除文件信息 + * + * @param fileIds 需要删除的数据ID + * @return 结果 + */ + public int deleteSysFileInfoByIds(String[] fileIds); +} diff --git a/box-test/src/main/java/com/ruoyi/test/mapper/TcUserMapper.java b/box-test/src/main/java/com/ruoyi/test/mapper/TcUserMapper.java new file mode 100644 index 000000000..39f541866 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/mapper/TcUserMapper.java @@ -0,0 +1,26 @@ +package com.ruoyi.test.mapper; + +import com.ruoyi.test.domain.TcUser; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Mapper +@Component("TCUserMapper") +public interface TcUserMapper { + //查询所有 + List selectAll(); + + //查询 by id + TcUser selectById(int id); + + //增加 + int insert(TcUser tcUser); + + //删除 by id + int deleteById(int id); + + //更新 by id + int updateById(TcUser tcUser); +} diff --git a/box-test/src/main/java/com/ruoyi/test/mapper/TestVerifyMapper.java b/box-test/src/main/java/com/ruoyi/test/mapper/TestVerifyMapper.java new file mode 100644 index 000000000..36327dd82 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/mapper/TestVerifyMapper.java @@ -0,0 +1,11 @@ +package com.ruoyi.test.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +@Mapper +@Component("TestVerifyMapper") +public interface TestVerifyMapper { + //检查姓名是否唯一 + int isNameUnique(String name); +} diff --git a/box-test/src/main/java/com/ruoyi/test/service/ISysCustomerService.java b/box-test/src/main/java/com/ruoyi/test/service/ISysCustomerService.java new file mode 100644 index 000000000..4a3aafa4d --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/service/ISysCustomerService.java @@ -0,0 +1,62 @@ +package com.ruoyi.test.service; + +import com.ruoyi.test.domain.SysCustomer; + +import java.util.List; + +/** + * 客户Service接口 + * + * @author box + * @date 2021-02-13 + */ +public interface ISysCustomerService +{ + /** + * 查询客户 + * + * @param customerId 客户ID + * @return 客户 + */ + public SysCustomer selectSysCustomerById(Long customerId); + + /** + * 查询客户列表 + * + * @param sysCustomer 客户 + * @return 客户集合 + */ + public List selectSysCustomerList(SysCustomer sysCustomer); + + /** + * 新增客户 + * + * @param sysCustomer 客户 + * @return 结果 + */ + public int insertSysCustomer(SysCustomer sysCustomer); + + /** + * 修改客户 + * + * @param sysCustomer 客户 + * @return 结果 + */ + public int updateSysCustomer(SysCustomer sysCustomer); + + /** + * 批量删除客户 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysCustomerByIds(String ids); + + /** + * 删除客户信息 + * + * @param customerId 客户ID + * @return 结果 + */ + public int deleteSysCustomerById(Long customerId); +} diff --git a/box-test/src/main/java/com/ruoyi/test/service/ISysFileInfoService.java b/box-test/src/main/java/com/ruoyi/test/service/ISysFileInfoService.java new file mode 100644 index 000000000..7df14d3ac --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/service/ISysFileInfoService.java @@ -0,0 +1,62 @@ +package com.ruoyi.test.service; + +import com.ruoyi.test.domain.SysFileInfo; + +import java.util.List; + +/** + * 文件信息Service接口 + * + * @author box + * @date 2021-05-06 + */ +public interface ISysFileInfoService +{ + /** + * 查询文件信息 + * + * @param fileId 文件信息ID + * @return 文件信息 + */ + public SysFileInfo selectSysFileInfoById(Long fileId); + + /** + * 查询文件信息列表 + * + * @param sysFileInfo 文件信息 + * @return 文件信息集合 + */ + public List selectSysFileInfoList(SysFileInfo sysFileInfo); + + /** + * 新增文件信息 + * + * @param sysFileInfo 文件信息 + * @return 结果 + */ + public int insertSysFileInfo(SysFileInfo sysFileInfo); + + /** + * 修改文件信息 + * + * @param sysFileInfo 文件信息 + * @return 结果 + */ + public int updateSysFileInfo(SysFileInfo sysFileInfo); + + /** + * 批量删除文件信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysFileInfoByIds(String ids); + + /** + * 删除文件信息信息 + * + * @param fileId 文件信息ID + * @return 结果 + */ + public int deleteSysFileInfoById(Long fileId); +} diff --git a/box-test/src/main/java/com/ruoyi/test/service/OracleDdlService.java b/box-test/src/main/java/com/ruoyi/test/service/OracleDdlService.java new file mode 100644 index 000000000..e6b5b6200 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/service/OracleDdlService.java @@ -0,0 +1,22 @@ +package com.ruoyi.test.service; + +public interface OracleDdlService { + //修改表名 + int alterTableName(String originalTableName, String newTableName); + + // truncate指定数据库表的数据 + int truncateTable(String tableName); + + //drop 指定定数据库表 + int dropTable(String tableName); + + + //根据传入的表明，创建新的表并且将原表的数据插入到新的Occur表中 + void copyTable(String newTableName,String originalTableName); + + //统计某张表中的总数据条数 + int getRecordCount(String tableName); + + //从指定数据库中，查询是否存在某张表 + int isTableInDb(String dataBaseName, String tableName); +} diff --git a/box-test/src/main/java/com/ruoyi/test/service/TcUserService.java b/box-test/src/main/java/com/ruoyi/test/service/TcUserService.java new file mode 100644 index 000000000..2f32e20cd --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/service/TcUserService.java @@ -0,0 +1,22 @@ +package com.ruoyi.test.service; + +import com.ruoyi.test.domain.TcUser; + +import java.util.List; + +public interface TcUserService { + //查询所有用户 + List selectAll(); + + //根据id查询用户信息 + TcUser selectById(int id); + + //新增用户 + TcUser insert (TcUser tcUser); + + // 根据id删除 + int deleteById (int id); + + //更新用户信息 + int updateById(TcUser tcUser); +} diff --git a/box-test/src/main/java/com/ruoyi/test/service/TestService.java b/box-test/src/main/java/com/ruoyi/test/service/TestService.java new file mode 100644 index 000000000..8b6b40b97 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/service/TestService.java @@ -0,0 +1,10 @@ +package com.ruoyi.test.service; + +import org.springframework.stereotype.Service; + +@Service +public class TestService { + public String test(){ + return "hello,box-test.test"; + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/service/TestVerifyService.java b/box-test/src/main/java/com/ruoyi/test/service/TestVerifyService.java new file mode 100644 index 000000000..6f6e9b0b4 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/service/TestVerifyService.java @@ -0,0 +1,9 @@ +package com.ruoyi.test.service; + +import org.springframework.stereotype.Service; + +@Service +public interface TestVerifyService { + //检查姓名是否唯一 + int isNameUnique(String name); +} diff --git a/box-test/src/main/java/com/ruoyi/test/service/impl/OracleDdlServiceImpl.java b/box-test/src/main/java/com/ruoyi/test/service/impl/OracleDdlServiceImpl.java new file mode 100644 index 000000000..1ebf0b930 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/service/impl/OracleDdlServiceImpl.java @@ -0,0 +1,45 @@ +package com.ruoyi.test.service.impl; + +import com.ruoyi.test.mapper.OracleDdlMapper; +import com.ruoyi.test.service.OracleDdlService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +//@DataSource(value = DataSourceType.SLAVE) +public class OracleDdlServiceImpl implements OracleDdlService { + @Autowired + private OracleDdlMapper oracleDdlMapper; + + //修改表名 + public int alterTableName(String originalTableName, String newTableName) + { + return oracleDdlMapper.alterTableName(originalTableName,newTableName); + } + + // truncate指定数据库表的数据 + public int truncateTable(String tableName){ + return oracleDdlMapper.truncateTable(tableName); + } + + //drop 指定定数据库表 + public int dropTable(String tableName){ + return oracleDdlMapper.dropTable(tableName); + } + + + //根据传入的表明，创建新的表并且将原表的数据插入到新的Occur表中 + public void copyTable(String newTableName,String originalTableName){ + return ; + } + + //统计某张表中的总数据条数 + public int getRecordCount(String tableName){ + return oracleDdlMapper.getRecordCount(tableName); + } + + //从指定数据库中，查询是否存在某张表 + public int isTableInDb(String dataBaseName, String tableName){ + return oracleDdlMapper.isTableInDb(dataBaseName,tableName); + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/service/impl/SysCustomerServiceImpl.java b/box-test/src/main/java/com/ruoyi/test/service/impl/SysCustomerServiceImpl.java new file mode 100644 index 000000000..a7d13ef6b --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/service/impl/SysCustomerServiceImpl.java @@ -0,0 +1,132 @@ +package com.ruoyi.test.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.test.domain.SysCustomer; +import com.ruoyi.test.domain.SysGoods; +import com.ruoyi.test.mapper.SysCustomerMapper; +import com.ruoyi.test.service.ISysCustomerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * 客户Service业务层处理 + * + * @author box + * @date 2021-02-13 + */ +@Service +public class SysCustomerServiceImpl implements ISysCustomerService +{ + @Autowired + private SysCustomerMapper sysCustomerMapper; + + /** + * 查询客户 + * + * @param customerId 客户ID + * @return 客户 + */ + @Override + public SysCustomer selectSysCustomerById(Long customerId) + { + return sysCustomerMapper.selectSysCustomerById(customerId); + } + + /** + * 查询客户列表 + * + * @param sysCustomer 客户 + * @return 客户 + */ + @Override + public List selectSysCustomerList(SysCustomer sysCustomer) + { + return sysCustomerMapper.selectSysCustomerList(sysCustomer); + } + + /** + * 新增客户 + * + * @param sysCustomer 客户 + * @return 结果 + */ + @Transactional + @Override + public int insertSysCustomer(SysCustomer sysCustomer) + { + int rows = sysCustomerMapper.insertSysCustomer(sysCustomer); + insertSysGoods(sysCustomer); + return rows; + } + + /** + * 修改客户 + * + * @param sysCustomer 客户 + * @return 结果 + */ + @Transactional + @Override + public int updateSysCustomer(SysCustomer sysCustomer) + { + sysCustomerMapper.deleteSysGoodsByCustomerId(sysCustomer.getCustomerId()); + insertSysGoods(sysCustomer); + return sysCustomerMapper.updateSysCustomer(sysCustomer); + } + + /** + * 删除客户对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Transactional + @Override + public int deleteSysCustomerByIds(String ids) + { + sysCustomerMapper.deleteSysGoodsByCustomerIds(Convert.toStrArray(ids)); + return sysCustomerMapper.deleteSysCustomerByIds(Convert.toStrArray(ids)); + } + + /** + * 删除客户信息 + * + * @param customerId 客户ID + * @return 结果 + */ + @Override + public int deleteSysCustomerById(Long customerId) + { + sysCustomerMapper.deleteSysGoodsByCustomerId(customerId); + return sysCustomerMapper.deleteSysCustomerById(customerId); + } + + /** + * 新增商品信息 + * + * @param sysCustomer 客户对象 + */ + public void insertSysGoods(SysCustomer sysCustomer) + { + List sysGoodsList = sysCustomer.getSysGoodsList(); + Long customerId = sysCustomer.getCustomerId(); + if (StringUtils.isNotNull(sysGoodsList)) + { + List list = new ArrayList(); + for (SysGoods sysGoods : sysGoodsList) + { + sysGoods.setCustomerId(customerId); + list.add(sysGoods); + } + if (list.size() > 0) + { + sysCustomerMapper.batchSysGoods(list); + } + } + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/service/impl/SysFileInfoServiceImpl.java b/box-test/src/main/java/com/ruoyi/test/service/impl/SysFileInfoServiceImpl.java new file mode 100644 index 000000000..a7407bbce --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/service/impl/SysFileInfoServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.test.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.test.domain.SysFileInfo; +import com.ruoyi.test.mapper.SysFileInfoMapper; +import com.ruoyi.test.service.ISysFileInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 文件信息Service业务层处理 + * + * @author box + * @date 2021-05-06 + */ +@Service +public class SysFileInfoServiceImpl implements ISysFileInfoService +{ + @Autowired + private SysFileInfoMapper sysFileInfoMapper; + + /** + * 查询文件信息 + * + * @param fileId 文件信息ID + * @return 文件信息 + */ + @Override + public SysFileInfo selectSysFileInfoById(Long fileId) + { + return sysFileInfoMapper.selectSysFileInfoById(fileId); + } + + /** + * 查询文件信息列表 + * + * @param sysFileInfo 文件信息 + * @return 文件信息 + */ + @Override + public List selectSysFileInfoList(SysFileInfo sysFileInfo) + { + return sysFileInfoMapper.selectSysFileInfoList(sysFileInfo); + } + + /** + * 新增文件信息 + * + * @param sysFileInfo 文件信息 + * @return 结果 + */ + @Override + public int insertSysFileInfo(SysFileInfo sysFileInfo) + { + return sysFileInfoMapper.insertSysFileInfo(sysFileInfo); + } + + /** + * 修改文件信息 + * + * @param sysFileInfo 文件信息 + * @return 结果 + */ + @Override + public int updateSysFileInfo(SysFileInfo sysFileInfo) + { + return sysFileInfoMapper.updateSysFileInfo(sysFileInfo); + } + + /** + * 删除文件信息对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteSysFileInfoByIds(String ids) + { + return sysFileInfoMapper.deleteSysFileInfoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除文件信息信息 + * + * @param fileId 文件信息ID + * @return 结果 + */ + @Override + public int deleteSysFileInfoById(Long fileId) + { + return sysFileInfoMapper.deleteSysFileInfoById(fileId); + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/service/impl/TcUserServiceImpl.java b/box-test/src/main/java/com/ruoyi/test/service/impl/TcUserServiceImpl.java new file mode 100644 index 000000000..ca691ce98 --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/service/impl/TcUserServiceImpl.java @@ -0,0 +1,48 @@ +package com.ruoyi.test.service.impl; + +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.test.domain.TcUser; +import com.ruoyi.test.mapper.TcUserMapper; +import com.ruoyi.test.service.TcUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@DataSource(value = DataSourceType.SQLSVR) +public class TcUserServiceImpl implements TcUserService { + @Autowired + private TcUserMapper tcUserMapper; + + //查询所有用户 + @Override + public List selectAll() { + return tcUserMapper.selectAll(); + } + + //查询 by id + @Override + public TcUser selectById(int id) { + return tcUserMapper.selectById(id); + } + + //新增 + @Override + public TcUser insert(TcUser tcUser) { + int user=tcUserMapper.insert(tcUser); + return tcUser; + } + + //删除by id + @Override + public int deleteById(int id) { + return tcUserMapper.deleteById(id); + } + //更新 by id + @Override + public int updateById(TcUser tcUser) { + return tcUserMapper.updateById(tcUser); + } +} diff --git a/box-test/src/main/java/com/ruoyi/test/service/impl/TestVerifyServiceImpl.java b/box-test/src/main/java/com/ruoyi/test/service/impl/TestVerifyServiceImpl.java new file mode 100644 index 000000000..0293b1c6d --- /dev/null +++ b/box-test/src/main/java/com/ruoyi/test/service/impl/TestVerifyServiceImpl.java @@ -0,0 +1,19 @@ +package com.ruoyi.test.service.impl; + +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.test.mapper.TestVerifyMapper; +import com.ruoyi.test.service.TestVerifyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +@DataSource(value = DataSourceType.SQLSVR) +public class TestVerifyServiceImpl implements TestVerifyService { + @Autowired + private TestVerifyMapper testVerifyMapper; + @Override + public int isNameUnique(String name) { + return testVerifyMapper.isNameUnique(name); + } +} diff --git a/box-test/src/main/resources/mapper/test/OracleDdlMapper.xml b/box-test/src/main/resources/mapper/test/OracleDdlMapper.xml new file mode 100644 index 000000000..08cb35d57 --- /dev/null +++ b/box-test/src/main/resources/mapper/test/OracleDdlMapper.xml @@ -0,0 +1,29 @@ + + + + + + alter table ${originalTableName} rename ${newTableName} + + + + truncate table ${tableName} + + + + drop table ${tableName} + + + + create table ${newTableName} as select * from ${originalTableName} + + + + + + + \ No newline at end of file diff --git a/box-test/src/main/resources/mapper/test/SysCustomerMapper.xml b/box-test/src/main/resources/mapper/test/SysCustomerMapper.xml new file mode 100644 index 000000000..d4e97c0b1 --- /dev/null +++ b/box-test/src/main/resources/mapper/test/SysCustomerMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select customer_id, customer_name, phonenumber, sex, birthday, remark from sys_customer + + + + + + + + insert into sys_customer + + customer_name, + phonenumber, + sex, + birthday, + remark, + + + #{customerName}, + #{phonenumber}, + #{sex}, + #{birthday}, + #{remark}, + + + + + update sys_customer + + customer_name = #{customerName}, + phonenumber = #{phonenumber}, + sex = #{sex}, + birthday = #{birthday}, + remark = #{remark}, + + where customer_id = #{customerId} + + + + delete from sys_customer where customer_id = #{customerId} + + + + delete from sys_customer where customer_id in + + #{customerId} + + + + + delete from sys_goods where customer_id in + + #{customerId} + + + + + delete from sys_goods where customer_id = #{customerId} + + + + insert into sys_goods( goods_id, customer_id, name, weight, price, date, type) values + + ( #{item.goodsId}, #{item.customerId}, #{item.name}, #{item.weight}, #{item.price}, #{item.date}, #{item.type}) + + + + \ No newline at end of file diff --git a/box-test/src/main/resources/mapper/test/SysFileInfoMapper.xml b/box-test/src/main/resources/mapper/test/SysFileInfoMapper.xml new file mode 100644 index 000000000..1fa4beeac --- /dev/null +++ b/box-test/src/main/resources/mapper/test/SysFileInfoMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + select file_id, file_name, file_path from sys_file_info + + + + + + + + insert into sys_file_info + + file_name, + file_path, + + + #{fileName}, + #{filePath}, + + + + + update sys_file_info + + file_name = #{fileName}, + file_path = #{filePath}, + + where file_id = #{fileId} + + + + delete from sys_file_info where file_id = #{fileId} + + + + delete from sys_file_info where file_id in + + #{fileId} + + + + \ No newline at end of file diff --git a/box-test/src/main/resources/mapper/test/TcUserMapper.xml b/box-test/src/main/resources/mapper/test/TcUserMapper.xml new file mode 100644 index 000000000..ee5f415f7 --- /dev/null +++ b/box-test/src/main/resources/mapper/test/TcUserMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + insert into tc_user + + + id, + + + name, + + + password, + + + + + #{id,jdbcType=INTEGER}, + + + #{name,jdbcType=VARCHAR}, + + + #{password,jdbcType=VARCHAR}, + + + + + + + delete from tc_user where id=#{id} + + + + + update tc_user + + + name = #{name,jdbcType=VARCHAR}, + + + password = #{password,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=INTEGER} + + + + \ No newline at end of file diff --git a/box-test/src/main/resources/mapper/test/TestVerifyMapper.xml b/box-test/src/main/resources/mapper/test/TestVerifyMapper.xml new file mode 100644 index 000000000..9995edb00 --- /dev/null +++ b/box-test/src/main/resources/mapper/test/TestVerifyMapper.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/box-test/src/main/resources/templates/test/customer/add.html b/box-test/src/main/resources/templates/test/customer/add.html new file mode 100644 index 000000000..c22d83716 --- /dev/null +++ b/box-test/src/main/resources/templates/test/customer/add.html @@ -0,0 +1,167 @@ + + + + + + + +
+
+

客户信息

+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+

商品信息

+
+
+ + +
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/box-test/src/main/resources/templates/test/customer/customer.html b/box-test/src/main/resources/templates/test/customer/customer.html new file mode 100644 index 000000000..484e01d18 --- /dev/null +++ b/box-test/src/main/resources/templates/test/customer/customer.html @@ -0,0 +1,117 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/box-test/src/main/resources/templates/test/customer/edit.html b/box-test/src/main/resources/templates/test/customer/edit.html new file mode 100644 index 000000000..41c5e9093 --- /dev/null +++ b/box-test/src/main/resources/templates/test/customer/edit.html @@ -0,0 +1,186 @@ + + + + + + + + +
+
+

客户信息

+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+

商品信息

+
+
+ + +
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/box-test/src/main/resources/templates/test/fileinfo/add.html b/box-test/src/main/resources/templates/test/fileinfo/add.html new file mode 100644 index 000000000..a3a91273a --- /dev/null +++ b/box-test/src/main/resources/templates/test/fileinfo/add.html @@ -0,0 +1,37 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/box-test/src/main/resources/templates/test/fileinfo/edit.html b/box-test/src/main/resources/templates/test/fileinfo/edit.html new file mode 100644 index 000000000..3d7f13c34 --- /dev/null +++ b/box-test/src/main/resources/templates/test/fileinfo/edit.html @@ -0,0 +1,38 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/box-test/src/main/resources/templates/test/fileinfo/fileinfo.html b/box-test/src/main/resources/templates/test/fileinfo/fileinfo.html new file mode 100644 index 000000000..a4b81a52c --- /dev/null +++ b/box-test/src/main/resources/templates/test/fileinfo/fileinfo.html @@ -0,0 +1,94 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/box-test/src/main/resources/templates/test/index.html b/box-test/src/main/resources/templates/test/index.html new file mode 100644 index 000000000..4b05e873e --- /dev/null +++ b/box-test/src/main/resources/templates/test/index.html @@ -0,0 +1,33 @@ + + + + + BPS后台管理系统-测试首页 + + +

BPS后台管理系统-测试首页



+一、Mybaits配置DML测试-Oracle（第二数据源） +
  • 查询所有用户
    • +
  • 新增ID为1000的用户
    • +
  • 根据ID查询用户,查询id=1000的用户
    • +
  • 修改用户为1000的用户姓名为Xia
    • +
  • 删除ID为1000的用户
    • + +

    +二、Mybaits配置DDL测试-Oracle +
  • 查询表中的记录数
    • +
  • 查询tc_user是否存在
    • +

    +Ajax发送获取Json配置测试 +

    +二、输入后验证测试 + +

  • 验证数据表中是否有记录
    • +

    + + +三、当前系统时间 + + + + \ No newline at end of file diff --git a/box-test/src/main/resources/templates/test/sendJson.html b/box-test/src/main/resources/templates/test/sendJson.html new file mode 100644 index 000000000..9c01a77e4 --- /dev/null +++ b/box-test/src/main/resources/templates/test/sendJson.html @@ -0,0 +1,99 @@ + + + + + 发送json + + + + + + +
    +

    + +
    +
    + + + diff --git a/box-test/src/main/resources/templates/test/testVerify.html b/box-test/src/main/resources/templates/test/testVerify.html new file mode 100644 index 000000000..b58ae6111 --- /dev/null +++ b/box-test/src/main/resources/templates/test/testVerify.html @@ -0,0 +1,65 @@ + + + + + + +
    +
    +
    +
    用户名： + + +
    + +
    +
    +
    + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 39b46e9ec..403d891cf 100644 --- a/pom.xml +++ b/pom.xml @@ -229,6 +229,20 @@ ${ruoyi.version} + + + com.ruoyi + box-test + ${ruoyi.version} + + + + + com.ruoyi + box-bps + ${ruoyi.version} + + @@ -239,6 +253,8 @@ ruoyi-quartz ruoyi-generator ruoyi-common + box-test + box-bps pom diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index bec326bca..b6225cc6d 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -8,7 +8,7 @@ 4.6.1 4.0.0 - jar + war ruoyi-admin @@ -61,6 +61,21 @@ mysql-connector-java + + + + com.oracle.database.jdbc + ojdbc6 + 11.2.0.4 + + + + + com.microsoft.sqlserver + mssql-jdbc + 8.4.1.jre8 + + com.ruoyi @@ -79,6 +94,18 @@ ruoyi-generator + + + com.ruoyi + box-test + + + + + com.ruoyi + box-bps + + diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 3c46fd50b..0c7535d6b 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -2,20 +2,48 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver + #driverClassName: com.mysql.cj.jdbc.Driver druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.2.18:3306/bps?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: password + password: abc.123 # 从库数据源 slave: # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: + enabled: true + url: jdbc:oracle:thin:@192.168.2.91:1521/toptest + username: ds7 + password: ds7 + driverClassName: oracle.jdbc.driver.OracleDriver + #SQlServer数据源 + sqlsvr: + # 从数据源开关/默认关闭 + enabled: true + url: jdbc:sqlserver://192.168.2.84:1433;SelectMethod=cursor;DatabaseName=ITDemo + username: sa + password: abc.123 + driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver + + # Topprod_ds_report + topproddsreport: + # 从数据源开关/默认关闭 + enabled: true + url: jdbc:oracle:thin:@192.168.2.91:1521/topprod + username: ds_report + password: ds_report + driverClassName: oracle.jdbc.driver.OracleDriver + + # Toptest_ds_report + toptestdsreport: + # 从数据源开关/默认关闭 + enabled: true + url: jdbc:oracle:thin:@192.168.2.91:1521/toptest + username: ds_report + password: ds_report + driverClassName: oracle.jdbc.driver.OracleDriver + # 初始连接数 initialSize: 5 # 最小连接池数量 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 764a13fd2..05a0bbb5c 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -9,7 +9,7 @@ ruoyi: # 实例演示开关 demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + profile: C:/bps-it/uploadPath # 获取ip地址开关 addressEnabled: false @@ -19,7 +19,7 @@ server: port: 80 servlet: # 应用的访问路径 - context-path: / + context-path: /it_war tomcat: # tomcat的URI编码 uri-encoding: UTF-8 @@ -96,7 +96,7 @@ shiro: # 首页地址 indexUrl: /index # 验证码开关 - captchaEnabled: true + captchaEnabled: false # 验证码类型 math 数组计算 char 字符 captchaType: math cookie: diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html index 3b22b02b8..ad433a8e1 100644 --- a/ruoyi-admin/src/main/resources/templates/index-topnav.html +++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html @@ -4,7 +4,7 @@ - 若依系统首页 + BPS管理系统首页 diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 4f41c96f0..629c56af7 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ - 若依系统首页 + BPS管理系统首页 @@ -26,7 +26,7 @@
    diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index 74ecf9646..d6f72c8de 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -3,8 +3,8 @@ - 登录若依系统 - + 登录BPS后台管理系统 + diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html index 88547f6cc..6e69c2cd0 100644 --- a/ruoyi-admin/src/main/resources/templates/main.html +++ b/ruoyi-admin/src/main/resources/templates/main.html @@ -1,1267 +1,121 @@ - - - - 若依介绍 - - - - + + + + 若依介绍 + + + + + -
    -
    -
    - 领取阿里云通用云产品1888优惠券 -
    https://www.aliyun.com/minisite/goods?userCode=brki8iof
    - 领取腾讯云通用云产品2860优惠券 -
    https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console
    - 阿里云服务器折扣区 ☛☛点我进入☚☚     腾讯云服务器秒杀区 ☛☛点我进入☚☚
    -

    云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)

    -
    +
    +

    BPS后台管理系统

    +

    + 当前版本（基于Ruoyi）：v[[${version}]] +

    +
    -
    -
    -
    -

    Hello,Guest

    - 移动设备访问请扫描以下二维码： -
    -
    - -
    -
    -
    -

    若依后台管理框架

    -

    一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统。，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。

    -

    - 当前版本：v[[${version}]] -

    -

    - ¥免费开源 -

    -
    -

    - - 访问码云 - - - 访问主页 - -

    -
    -
    -

    技术选型：

    -
      -
    1. 核心框架：Spring Boot。
      2. -
    2. 安全框架：Apache Shiro。
      3. -
    3. 模板引擎：Thymeleaf。
      4. -
    4. 持久层框架：MyBatis。
      5. -
    5. 定时任务:Quartz。
      6. -
    6. 数据库连接池：Druid。
      7. -
    7. 工具类：Fastjson。
      8. -
    8. 更多……
      9. -
    -
    +
    +
    +
    -
    -
    -
    -
    - -
    -
    -
    联系信息
    - -
    -
    -

    官网：http://www.ruoyi.vip -

    -

    QQ群：满1389287 满1679294 满1529866 满1772718 满1366522 满1382251 满1145125 满86752435 满134072510 满210336300 满339522636 满130035985 满143151071 满158781320 201531282 -

    -

    微信：/ *若依 -

    -

    支付宝：/ *若依 -

    -
    -
    -
    -
    -
    -
    -
    更新日志
    -
    -
    -
    -
    -
    +
    +
    + 业务模块 +
    +
    +

    若依官网：http://www.ruoyi.vip +

    Demo首页：http://localhost/test

    +
    +
    +
    +
    +
    +
    + 更新日志 +
    +
    +
    +
    +
    -
    - v4.6.12021.04.12 -
    -
    -
    -
    -
      -
    1. 新增IE浏览器版本过低提示页面
      2. -
    2. 新增详细信息tab页签方式
      3. -
    3. 新增解锁屏幕打开上次页签
      4. -
    4. 数据监控默认账户密码防止越权访问
      5. -
    5. 新增表格示例（导出选择列）
      6. -
    6. 个人信息添加手机&邮箱重复验证
      7. -
    7. 个人中心刷新后样式问题
      8. -
    8. 操作日志返回参数添加非空验证
      9. -
    9. velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞
      10. -
    10. 子表模板默认日期格式化
      11. -
    11. 代码生成预览语言根据后缀名高亮显示
      12. -
    12. 代码生成主子表相同字段导致数据问题
      13. -
    13. 升级SpringBoot到最新版本2.2.13
      14. -
    14. 升级shiro到最新版1.7.1 阻止身份认证绕过漏洞
      15. -
    15. 升级bootstrapTable到最新版本v1.18.2
      16. -
    16. 升级bootstrapTable相关组件到最新版本v1.18.2
      17. -
    17. 升级fastjson到最新版1.2.75
      18. -
    18. 升级druid到最新版本v1.2.4
      19. -
    19. 升级oshi到最新版本v5.6.0
      20. -
    20. 修改ip字段长度防止ipv6地址长度不够
      21. -
    21. 搜索建议示例选择后隐藏列表
      22. -
    22. 主子表示例增加初始化数据
      23. -
    23. 优化Excel导入增加空行判断
      24. -
    24. 修复横向菜单无法打开页签问题
      25. -
    25. 修复导入数据为负浮点数时，导入结果会丢失精度问题
      26. -
    26. 优化更多操作按钮左侧移入内容闪现消失情况
      27. -
    27. 修复主子表提交中列隐藏后出现列偏移问题
      28. -
    28. 单据打印网页时通过hidden-print隐藏元素
      29. -
    29. 表格销毁清除记住选择数据
      30. -
    30. 增加表格动态列示例
      31. -
    31. 代码生成选择主子表关联元素必填
      32. -
    32. tree根据Id和Name选中指定节点增加空判断
      33. -
    33. 其他细节优化
      34. -
    -
    -
    -
    -
    -
    -
    - v4.6.02021.01.01 -
    +
    + v4.6.02021.01.01 +
    -
      -
    1. 新增缓存监控管理
      2. -
    2. 新增锁定屏幕功能
      3. -
    3. 菜单新增是否刷新页面
      4. -
    4. 删除用户和角色解绑关联
      5. -
    5. 新增密码强度字符范围提示
      6. -
    6. 防止匿名访问进行过滤
      7. -
    7. 升级SpringBoot到最新版本2.2.12
      8. -
    8. 升级poi到最新版本4.1.2
      9. -
    9. 升级bitwalker到最新版本1.21
      10. -
    10. 升级bootstrap-fileinput到最新版本5.1.3
      11. -
    11. 升级bootstrapTable到最新版本v1.18.0
      12. -
    12. 升级bootstrapTable相关组件到最新版本v1.18.0
      13. -
    13. 升级oshi到最新版本v5.3.6
      14. -
    14. 新增示例（标签 & 提示）
      15. -
    15. 添加单据打印示例
      16. -
    16. 修改表格初始参数sortName默认值为undefined
      17. -
    17. 新增表格参数（自定义打印页面模板printPageBuilder）
      18. -
    18. 新增表格参数（是否显示行间隔色striped）
      19. -
    19. 新增表格参数（渲染完成后执行的事件onPostBody）
      20. -
    20. Excel注解支持Image图片导出
      21. -
    21. Excel支持注解align对齐方式
      22. -
    22. Excel支持导入Boolean型数据
      23. -
    23. 主子表操作添加通用addColumn方法
      24. -
    24. 代码生成日期控件区分范围
      25. -
    25. 代码生成数据库文本类型生成表单文本域
      26. -
    26. 修复生成主子表外键名错误
      27. -
    27. 选项卡新增是否刷新属性
      28. -
    28. 修复树表格表头跟表格宽度不同步的问题
      29. -
    29. 表格树加载完成触发tooltip方法
      30. -
    30. 使用widthUnit定义树表格选项单位
      31. -
    31. 修复主子表editColumn序列问题
      32. -
    32. 修复添加全屏在无参数时没有替换url参数问题
      33. -
    33. 弹出层openOptions移动端自适应
      34. -
    34. 防止错误页返回主页出现嵌套问题
      35. -
    35. 设置回显数据字典验证防止空值
      36. -
    36. 其他细节优化
      37. +
        +
      1. 新增缓存监控管理
    -
    +
    -
    - v4.5.12020.11.18 -
    +
    + v4.5.12020.11.18 +
    -
      -
    1. 阻止任意文件下载漏洞
      2. -
    2. 升级shiro到最新版1.7.0 阻止权限绕过漏洞
      3. -
    3. 升级druid到最新版本v1.2.2
      4. -
    4. 新增表格行触发事件（onCheck、onUncheck、onCheckAll、onUncheckAll）
      5. -
    5. 修复多页签关闭非当前选项出现空白问题
      6. -
    6. 代码生成预览支持高亮显示
      7. -
    7. mapperLocations配置支持分隔符
      8. -
    8. 权限信息调整
      9. -
    9. 个人中心头像和上传头像增加默认图片
      10. -
    10. 全局配置类保持和其他应用命名相同
      11. +
        +
      1. 阻止任意文件下载漏洞
    -
    -
    -
    - v4.5.02020.10.20 -
    -
    -
    -
    -
      -
    1. 新增菜单导航显示风格（default为左侧导航菜单，topnav为顶部导航菜单）
      2. -
    2. 菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）
      3. -
    3. 账号密码支持自定义更新周期
      4. -
    4. 初始密码支持自定义修改策略
      5. -
    5. 新增校验用户修改新密码不能与旧密码相同
      6. -
    6. 添加检查密码范围支持的特殊字符包括：~!@#$%^&*()-=_+
      7. -
    7. 注册账号设置默认用户名称及密码最后更新时间
      8. -
    8. 去除用户手机邮箱部门必填验证
      9. -
    9. 新增日期格式化方法
      10. -
    10. 代码生成添加bit类型
      11. -
    11. 树结构加载添加callBack回调方法
      12. -
    12. 修复用户管理页面滚动返回顶部条失效
      13. -
    13. 修复代码生成模板文件上传组件缺少ctx的问题
      14. -
    14. 限制系统内置参数不允许删除
      15. -
    15. 新增表格列宽拖动插件
      16. -
    16. 新增Ajax局部刷新demo
      17. -
    17. 新增是否开启页脚功能
      18. -
    18. 新增表格参数（通过自定义函数设置标题样式headerStyle）
      19. -
    19. 新增表格参数（通过自定义函数设置页脚样式footerStyle）
      20. -
    20. 修复窗体大小改变后浮动提示框失效问题
      21. -
    21. 生成代码补充必填样式
      22. -
    22. 生成页面时不忽略remark属性
      23. -
    23. 字典数据列表页添加关闭按钮
      24. -
    24. Excel注解支持自动统计数据总和
      25. -
    25. 升级springboot到2.1.17 提升安全性
      26. -
    26. 升级pagehelper到最新版1.3.0
      27. -
    27. 升级druid到最新版本v1.2.1
      28. -
    28. 升级fastjson到最新版1.2.74
      29. -
    29. 升级bootstrap-fileinput到最新版本5.1.2
      30. -
    30. 升级oshi到最新版本v5.2.5
      31. -
    31. 表单向导插件更换为jquery-smartwizard
      32. -
    32. 修改主子表提交示例代码防止渲染失效
      33. -
    33. 添加导入数据弹出窗体自定义宽高
      34. -
    34. 用户信息参数返回忽略掉密码字段
      35. -
    35. 优化关闭窗体添加index参数
      36. -
    36. 回显数据字典（字符串数组）增加空值判断
      37. -
    37. 修改前端密码长度校验和错误提示不符问题
      38. -
    38. AjaxResult重写put方法，以方便链式调用
      39. -
    39. 增强验证码校验的语义，更易懂
      40. -
    40. 导入excel整形值校验优化
      41. -
    41. Excel导出类型NUMERIC支持精度浮点类型
      42. -
    42. 导出Excel调整targetAttr获取值方法，防止get方法不规范
      43. -
    43. 输入框组验证错误后置图标提示颜色
      44. -
    44. 上传媒体类型添加视频格式
      45. -
    45. 数据权限判断参数类型
      46. -
    46. 修正数据库字符串类型nvarchar
      47. -
    47. 优化递归子节点
      48. -
    48. 修复多表格搜索formId无效
      49. -
    49. 其他细节优化
      50. -
    -
    -
    -
    -
    -
    -
    - v4.4.02020.08.24 -
    -
    -
    -
    -
      -
    1. 升级bootstrapTable到最新版本1.17.1
      2. -
    2. 升级shiro到最新版1.6.0 阻止权限绕过漏洞
      3. -
    3. 升级fastjson到最新版1.2.73
      4. -
    4. 代码生成支持同步数据库
      5. -
    5. 代码生成支持富文本控件
      6. -
    6. 用户密码支持自定义配置规则
      7. -
    7. 新增表格自动刷新插件
      8. -
    8. 新增表格打印配置插件
      9. -
    9. 更换图片裁剪工具为cropper
      10. -
    10. Excel支持sort导出排序
      11. -
    11. 代码生成支持自定义路径
      12. -
    12. 代码生成支持选择上级菜单
      13. -
    13. 代码生成支持上传控件
      14. -
    14. 新增表格参数（自定义加载文本的字体大小loadingFontSize）
      15. -
    15. Excel注解支持设置BigDecimal精度&舍入规则
      16. -
    16. 操作日志记录排除敏感属性字段
      17. -
    17. 修复不同浏览器附件下载中文名乱码的问题
      18. -
    18. 用户分配角色不允许选择超级管理员角色
      19. -
    19. 更换表格冻结列插件
      20. -
    20. 添加右侧冻结列示例
      21. -
    21. 升级表格行编辑&移动端适应插件
      22. -
    22. 修复更新表格插件后无法设置实例配置问题
      23. -
    23. 修复更新表格插件后导致的主子表错误
      24. -
    24. 修复页面存在多表格，回调函数res数据不正确问题
      25. -
    25. 强退&过期清理登录帐号缓存会话
      26. -
    26. 表格树标题内容支持html语义化标签
      27. -
    27. 修复配置应用的访问路径首页页签重复问题
      28. -
    28. 优化openTab打开时滚动到当前页签
      29. -
    29. 表格请求方式method支持自定义配置
      30. -
    30. 菜单页签联动优化
      31. -
    31. 用户邮箱长度限制修改为50
      32. -
    32. 主子表示例添加日期格式案例
      33. -
    33. 修改表格行内编辑示例旧值参数
      34. -
    34. 操作日志查询方式调整
      35. -
    35. 唯一限制条件只返回单条数据
      36. -
    36. 修改Excel设置STRING单元格类型
      37. -
    37. 添加获取当前的环境配置方法
      38. -
    38. 截取返回参数长度，防止超出异常
      39. -
    39. 定时任务cron表达式验证
      40. -
    40. 拆分表格插件，按需引入
      41. -
    41. 多行文本框补齐必填错误提示背景
      42. -
    42. 其他细节优化
      43. -
    -
    -
    -
    -
    -
    -
    - v4.3.12020.07.05 -
    -
    -
    -
    -
      -
    1. 国家信息安全漏洞（请务必保持cipherKey密钥唯一性）
      2. -
    2. 升级shiro到最新版1.5.3 阻止权限绕过漏洞
      3. -
    3. 修改验证码在使用后清除，防止多次使用
      4. -
    4. 检查字符支持小数点&降级改成异常提醒
      5. -
    5. openOptions函数中加入自定义maxmin属性
      6. -
    6. 支持openOptions方法最大化
      7. -
    7. 支持openOptions方法多个按钮回调
      8. -
    8. 新增isLinkage支持页签与菜单联动
      9. -
    9. 修改代码生成导入表结构出现异常页面不提醒问题
      10. -
    10. 优化用户头像发生错误，则显示一个默认头像
      11. -
    11. Excel导出支持字典类型
      12. -
    -
    -
    -
    -
    -
    -
    - v4.3.02020.06.22 -
    -
    -
    -
    -
      -
    1. 代码生成模板支持主子表
      2. -
    2. 代码生成显示类型支持复选框
      3. -
    3. 前端表单样式修改成圆角
      4. -
    4. 新增回显数据字典（字符串数组）
      5. -
    5. 修复浏览器手动缩放比例后菜单无法自适应问题
      6. -
    6. 限制用户不允许选择系统管理员角色
      7. -
    7. 用户信息添加输入框组图标&鼠标按下显示密码
      8. -
    8. 升级fastjson到最新版1.2.70 修复高危安全漏洞
      9. -
    9. 升级Bootstrap版本到v3.3.7
      10. -
    10. 修复selectColumns方法获取子对象数据无效问题
      11. -
    11. 修改数据源类型优先级，先根据方法，再根据类
      12. -
    12. 修改上级部门（选择项排除本身和下级）
      13. -
    13. 首页菜单显示调整
      14. -
    14. 添加是否开启swagger配置
      15. -
    15. 新增示例（主子表提交）
      16. -
    16. 新增示例（多级联动下拉示例）
      17. -
    17. 新增示例（表格属性data数据加载）
      18. -
    18. 新增表格列参数（是否列选项可见ignore）
      19. -
    19. 新增表格参数（是否启用显示卡片视图cardView）
      20. -
    20. 新增表格参数（是否显示全屏按钮showFullscreen）
      21. -
    21. 新增表格参数（是否启用分页条无限循环的功能paginationLoop）
      22. -
    22. 新增表格参数（是否显示表头showHeader）
      23. -
    23. 表格添加显示/隐藏所有列方法 showAllColumns/hideAllColumns
      24. -
    24. 修复部分情况节点不展开问题
      25. -
    25. 修复关闭标签页后刷新还是上次地址问题
      26. -
    26. 修复选择菜单后刷新页面，菜单箭头显示不对问题
      27. -
    27. 修复jquery表单序列化时复选框未选中不会序列化到对象中问题
      28. -
    28. Excel支持readConverterExp读取字符串组内容
      29. -
    29. 更换IP地址查询接口
      30. -
    30. 默认关闭获取ip地址
      31. -
    31. 操作处理ajaxSuccess判断修正
      32. -
    32. HttpUtils.sendPost()方法，参数无需拼接参数到url
      33. -
    33. 通用http发送方法增加参数 contentType 编码类型
      34. -
    34. HTML过滤器不替换&实体
      35. -
    35. 代码生成浮点型改用BigDecimal
      36. -
    36. 修复表单构建单选和多选框渲染问题
      37. -
    37. 代码生成模板调整，字段为String并且必填则加空串条件
      38. -
    38. 字典数据查询列表根据dictSort升序排序
      39. -
    39. 修复树表对imageView和tooltip方法无效问题
      40. -
    40. 修复Long类型比较相等问题调整
      41. -
    41. 示例demo页面清除html链接，防止点击后跳转出现404
      42. -
    42. 在线用户强退方法合并
      43. -
    43. 添加校验部门包含未停用的子部门
      44. -
    44. 取消回车自动提交表单
      45. -
    45. 'A','I','BUTTON' 标签忽略clickToSelect事件，防止点击操作按钮时选中
      46. -
    46. 邮箱显示截取部分字符串，防止低分辨率错位
      47. -
    47. 代码生成列属性根据sort排序
      48. -
    48. 修复更多操作部分浏览器不兼容情况
      49. -
    49. 图片预览事件属性修正
      50. -
    50. 修复冻结列排序样式无效问题
      51. -
    51. 修复context-path的情况下个人中心刷新导致样式问题
      52. -
    52. 全屏editFull打开适配表树
      53. -
    53. 其他细节优化
      54. -
    -
    -
    -
    -
    -
    -
    - v4.2.02020.03.23 -
    -
    -
    -
    -
      -
    1. 用户管理添加分配角色页面
      2. -
    2. 定时任务添加调度日志按钮
      3. -
    3. 新增是否开启用户注册功能
      4. -
    4. 新增页面滚动显示返回顶部按钮
      5. -
    5. 用户&角色&任务添加更多操作按钮
      6. -
    6. iframe框架页会话过期弹出超时提示
      7. -
    7. 移动端登录不显示左侧菜单
      8. -
    8. 侧边栏添加一套深蓝色主题
      9. -
    9. 首页logo固定，不随菜单滚动
      10. -
    10. 支持mode配置history（表示去掉地址栏的#）
      11. -
    11. 任务分组字典翻译（调度日志详细）
      12. -
    12. 字典管理添加缓存读取
      13. -
    13. 字典数据列表标签显示样式
      14. -
    14. 参数管理支持缓存操作
      15. -
    15. 日期控件清空结束时间设置开始默认值为2099-12-31
      16. -
    16. 表格树添加获取数据后响应回调处理
      17. -
    17. 批量替换表前缀调整
      18. -
    18. 支持表格导入模板的弹窗表单加入其它输入控件
      19. -
    19. 表单重置刷新表格树
      20. -
    20. 新增支持导出数据字段排序
      21. -
    21. 新增表格参数（是否单选checkbox）
      22. -
    22. druid未授权不允许访问
      23. -
    23. 表格树父节点兼容0,'0','',null
      24. -
    24. 表单必填的项添加星号
      25. -
    25. 修复select2不显示校验错误信息
      26. -
    26. 添加自定义HTML过滤器
      27. -
    27. 修复多数据源下开关关闭出现异常问题
      28. -
    28. 修复翻页记住选择项数据问题
      29. -
    29. 用户邮箱长度限制20
      30. -
    30. 修改错误页面返回主页出现嵌套问题
      31. -
    31. 表格浮动提示单双引号转义
      32. -
    32. 支持配置四级菜单
      33. -
    33. 升级shiro到最新版1.4.2 阻止rememberMe漏洞攻击
      34. -
    34. 升级summernote到最新版本v0.8.12
      35. -
    35. 导入Excel根据dateFormat属性格式处理
      36. -
    36. 修复War部署无法正常shutdown,ehcache内存泄漏
      37. -
    37. 修复代码生成短字段无法识别问题
      38. -
    38. 修复serviceImpl模版，修改方法判断日期错误
      39. -
    39. 代码生成模板增加导出功能日志记录
      40. -
    40. 代码生成唯一编号调整为tableId
      41. -
    41. 代码生成查询时忽略大小写
      42. -
    42. 代码生成支持翻页记住选中
      43. -
    43. 代码生成表注释未填写也允许导入
      44. -
    44. Global全局配置类修改为注解，防止多环境配置下读取问题
      45. -
    45. 修复多表格情况下，firstLoad只对第一个表格生效
      46. -
    46. 处理Maven打包出现警告问题
      47. -
    47. 默认主题样式，防止网速慢情况下出现空白
      48. -
    48. 修复文件上传多级目录识别问题
      49. -
    49. 锚链接解码url，防止中文导致页面不能加载问题
      50. -
    50. 修复右键Tab页刷新事件重复请求问题
      51. -
    51. 角色禁用&菜单隐藏不查询权限
      52. -
    52. 其他细节优化
      53. -
    -
    -
    -
    -
    -
    -
    - v4.1.02019.10.22 -
    -
    -
    -
    -
      -
    1. 支持多表格实例操作
      2. -
    2. 浮动提示方法tooltip支持弹窗
      3. -
    3. 代码生成&字典数据支持模糊条件查询
      4. -
    4. 增加页签全屏方法
      5. -
    5. 增加清除表单验证错误信息方法
      6. -
    6. 支持iframe局部刷新页面
      7. -
    7. 支持在线切换主题
      8. -
    8. 修改图片预览设置的高宽参数颠倒问题
      9. -
    9. 操作日志新增解锁账户功能
      10. -
    10. 管理员用户&角色不允许操作
      11. -
    11. 去掉jsoup包调用自定义转义工具
      12. -
    12. 添加时间轴示例
      13. -
    13. 修复翻页记住选择时获取指定列值的问题
      14. -
    14. 代码生成sql脚本添加导出按钮
      15. -
    15. 添加表格父子视图示例
      16. -
    16. 添加表格行内编辑示例
      17. -
    17. 升级fastjson到最新版1.2.60 阻止漏洞攻击
      18. -
    18. 升级echarts到最新版4.2.1
      19. -
    19. 操作日志新增返回参数
      20. -
    20. 支持mybatis通配符扫描任意多个包
      21. -
    21. 权限验证多种情况处理
      22. -
    22. 修复树形类型的代码生成的部分必要属性无法显示
      23. -
    23. 修复非表格插件情况下重置出现异常
      24. -
    24. 修复富文本编辑器有序列表冲突
      25. -
    25. 代码生成表前缀配置支持多个
      26. -
    26. 修复自动去除表前缀配置无效问题
      27. -
    27. 菜单列表按钮数据可见不显示（权限标识控制）
      28. -
    28. 修复设置会话超时时间无效问题
      29. -
    29. 新增本地资源通用下载方法
      30. -
    30. 操作日志记录新增请求方式
      31. -
    31. 代码生成单选按钮属性重名修复
      32. -
    32. 优化select2下拉框宽度不会随浏览器改变
      33. -
    33. 修复代码生成树表异常
      34. -
    34. 其他细节优化
      35. -
    -
    -
    -
    -
    -
    -
    - v4.0.02019.08.08 -
    -
    -
    -
    -
      -
    1. 代码生成支持预览、编辑，保存方案
      2. -
    2. 新增防止表单重复提交注解
      3. -
    3. 新增后端校验（和前端保持一致）
      4. -
    4. 新增同一个用户最大会话数控制
      5. -
    5. Excel导出子对象支持多个字段
      6. -
    6. 定时任务支持静态调用和多参数
      7. -
    7. 定时任务增加分组条件查询
      8. -
    8. 字典类型增加任务分组数据
      9. -
    9. 新增表格是否首次加载数据
      10. -
    10. 新增parentTab选项卡可在同一页签打开
      11. -
    11. 多数据源支持类注解（允许继承父类的注解）
      12. -
    12. 部门及以下数据权限（调整为以下及所有子节点）
      13. -
    13. 新增角色数据权限配（仅本人数据权限）
      14. -
    14. 修改菜单权限显示问题
      15. -
    15. 上传文件修改路径及返回名称
      16. -
    16. 添加报表插件及示例
      17. -
    17. 添加首页统计模板
      18. -
    18. 添加表格拖拽示例
      19. -
    19. 添加卡片列表示例
      20. -
    20. 添加富文本编辑器示例
      21. -
    21. 添加表格动态增删改查示例
      22. -
    22. 添加用户页面岗位选择框提示
      23. -
    23. 点击菜单操作添加背景高亮显示
      24. -
    24. 表格树新增showSearch是否显示检索信息
      25. -
    25. 解决表格列设置sortName无效问题
      26. -
    26. 表格图片预览支持自定义设置宽高
      27. -
    27. 添加表格列浮动提示（单击文本复制）
      28. -
    28. PC端收起菜单后支持浮动显示
      29. -
    29. 详细操作样式调整
      30. -
    30. 修改用户更新描述空串不更新问题
      31. -
    31. 导入修改为模板渲染
      32. -
    32. 修改菜单及部门排序规则
      33. -
    33. 角色导出数据范围表达式翻译
      34. -
    34. 添加summernote富文本字体大小
      35. -
    35. 优化表格底部下边框防重叠&汇总像素问题
      36. -
    36. 树表格支持属性多层级访问
      37. -
    37. 修复IE浏览器用户管理界面右侧留白问题
      38. -
    38. 重置按钮刷新表格
      39. -
    39. 重置密码更新用户缓存
      40. -
    40. 优化验证码属性参数
      41. -
    41. 支持数据监控配置用户名和密码
      42. -
    42. 文件上传修改按钮背景及加载动画
      43. -
    43. 支持配置一级菜单href跳转
      44. -
    44. 侧边栏添加一套浅色主题
      45. -
    45. 树表格添加回调函数（校验异常状态）
      46. -
    46. 用户个人中心适配手机端显示
      47. -
    47. Excel支持设置导出类型&更换样式
      48. -
    48. 检查属性改变修改为克隆方式（防止热部署强转异常）
      49. -
    49. 其他细节优化
      50. -
    -
    -
    -
    -
    -
    -
    - v3.4.02019.06.03 -
    -
    -
    -
    -
      -
    1. 新增实例演示菜单及demo
      2. -
    2. 新增页签右键操作
      3. -
    3. 菜单管理新增打开方式
      4. -
    4. 新增点击某行触发的事件
      5. -
    5. 新增双击某行触发的事件
      6. -
    6. 新增单击某格触发的事件
      7. -
    7. 新增双击某格触发的事件
      8. -
    8. 新增是否启用显示细节视图
      9. -
    9. 支持上传任意格式文件
      10. -
    10. 修复角色权限注解失效问题
      11. -
    11. 左侧的菜单栏宽度调整
      12. -
    12. 新增响应完成后自定义回调函数
      13. -
    13. 支持前端及其他模块直接获取用户信息
      14. -
    14. 升级swagger到最新版2.9.2
      15. -
    15. 升级jquery.slimscroll到最新版1.3.8
      16. -
    16. 升级select2到最新版4.0.7
      17. -
    17. 新增角色配置本部门数据权限
      18. -
    18. 新增角色配置本部门及以下数据权限
      19. -
    19. 优化底部操作防止跳到页面顶端
      20. -
    20. 修改冻结列选框无效及样式问题
      21. -
    21. 修复部门四层级修改祖级无效问题
      22. -
    22. 更换开关切换按钮样式
      23. -
    23. 新增select2-bootstrap美化下拉框
      24. -
    24. 添加表格内图片预览方法
      25. -
    25. 修复权限校验失败跳转页面路径错误
      26. -
    26. 国际化资源文件调整
      27. -
    27. 通知公告布局调整
      28. -
    28. 删除页签操作功能
      29. -
    29. 表格树新增查询指定列值
      30. -
    30. 更改系统接口扫描方式及完善测试案例
      31. -
    31. 表格列浮动提示及字典回显默认去背景
      32. -
    32. 修复启用翻页记住前面的选择check没选中问题
      33. -
    33. 去除监控页面底部的广告
      34. -
    34. 日期控件功问题修复及data功能增强
      35. -
    35. 新增角色权限可见性（前端直接调用）
      36. -
    36. 新增获取当前登录用户方法（前端及子模块调用）
      37. -
    37. 修复热部署重启导致菜单丢失问题
      38. -
    38. 优化业务校验失败普通请求跳转页面
      39. -
    39. 操作日志新增状态条件查询
      40. -
    40. 操作类型支持多选条件查询
      41. -
    41. 通知公告防止滚动触底回弹优化
      42. -
    42. 其他细节优化
      43. -
    -
    -
    -
    -
    -
    -
    - v3.3.02019.04.01 -
    -
    -
    -
    -
      -
    1. 新增线程池统一管理
      2. -
    2. 新增支持左右冻结列
      3. -
    3. 新增表格字符超长浮动提示
      4. -
    4. 升级datepicker拓展并汉化
      5. -
    5. 升级druid到最新版本v1.1.14
      6. -
    6. 修复个人头像为图片服务器跨域问题
      7. -
    7. 修改上传文件按日期存储
      8. -
    8. 新增表格客户端分页选项
      9. -
    9. 新增表格的高度参数
      10. -
    10. 新增表格销毁方法
      11. -
    11. 新增表格下拉按钮切换方法
      12. -
    12. 新增表格分页跳转到指定页码
      13. -
    13. 新增表格启用点击选中行参数
      14. -
    14. 修复表格数据重新加载未触发部分按钮禁用
      15. -
    15. 使用jsonview展示操作日志参数
      16. -
    16. 新增方法（addTab、editTab）
      17. -
    17. 修改用户管理界面为Tab打开方式
      18. -
    18. 表单验证代码优化
      19. -
    19. 修复@Excel注解 prompt 属性使用报错
      20. -
    20. 修复combo属性Excel兼容性问题
      21. -
    21. 新增@Excel导入导出支持父类字段
      22. -
    22. 修复关闭最后选项卡无法激活滚动问题
      23. -
    23. 增加日期控件显示类型及回显格式扩展选项
      24. -
    24. 修复定时任务执行失败后入库状态为成功状态
      25. -
    25. 支持定时任务并发开关控制
      26. -
    26. 优化权限校验失败普通请求跳转页面
      27. -
    27. 捕获线程池执行任务抛出的异常
      28. -
    28. 修复IE浏览器导出功能报错
      29. -
    29. 新增角色管理分配用户功能
      30. -
    30. 新增表格翻页记住前面的选择
      31. -
    31. 调整用户个人中心页面
      32. -
    32. 修复界面存在的一些安全问题
      33. -
    33. 其他细节优化
      34. -
    -
    -
    -
    -
    -
    -
    - v3.2.02019.01.18 -
    -
    -
    -
    -
      -
    1. 部门修改时不允许选择最后节点
      2. -
    2. 修复部门菜单排序字段无效
      3. -
    3. 修复光驱磁盘导致服务监控异常
      4. -
    4. 登录界面去除check插件
      5. -
    5. 验证码文本字符间距修正
      6. -
    6. 升级SpringBoot到最新版本2.1.1
      7. -
    7. 升级MYSQL驱动
      8. -
    8. 修正登录必填项位置偏移
      9. -
    9. Session会话检查优化
      10. -
    10. Excel注解支持多级获取
      11. -
    11. 新增序列号生成方法
      12. -
    12. 修复WAR部署tomcat退出线程异常
      13. -
    13. 全屏操作增加默认确认/关闭
      14. -
    14. 修复个人信息可能导致漏洞
      15. -
    15. 字典数据根据下拉选择新增类型
      16. -
    16. 升级Summernote到最新版本v0.8.11
      17. -
    17. 新增用户数据导入
      18. -
    18. 首页主题样式更换
      19. -
    19. layer扩展主题更换
      20. -
    20. 用户管理移动端默认隐藏左侧布局
      21. -
    21. 详细信息弹出层显示在顶层
      22. -
    22. 表格支持切换状态（用户/角色/定时任务）
      23. -
    23. Druid数据源支持配置继承
      24. -
    24. 修正部分iPhone手机端表格适配问题
      25. -
    25. 新增防止重复提交表单方法
      26. -
    26. 新增表格数据统计汇总方法
      27. -
    27. 支持富文本上传图片文件
      28. -
    -
    -
    -
    -
    -
    -
    - v3.1.02018.12.03 -
    -
    -
    -
    -
      -
    1. 新增内网不获取IP地址
      2. -
    2. 新增cron表达式有效校验
      3. -
    3. 定时任务新增详细信息
      4. -
    4. 定时任务默认策略修改（不触发立即执行）
      5. -
    5. 定时任务显示下一个执行周期
      6. -
    6. 支持前端任意日期格式处理
      7. -
    7. 上传头像删除多余提交按钮
      8. -
    8. 表格增加行间隔色配置项
      9. -
    9. 表格增加转义HTML字符串配置项
      10. -
    10. 表格增加显示/隐藏指定列
      11. -
    11. 代码生成优化
      12. -
    12. 操作日志参数格式化显示
      13. -
    13. 页签新增新增全屏显示
      14. -
    14. 新增一键打包部署
      15. -
    15. Excel注解新增多个参数
      16. -
    16. 新增提交静默更新表格方法
      17. -
    17. 新增服务监控菜单
      18. -
    -
    -
    -
    -
    -
    -
    - v3.0.02018.10.08 -
    -
    -
    -
    -
      -
    1. 升级poi到最新版3.17
      2. -
    2. 导出修改临时目录绝对路径
      3. -
    3. 升级laydate到最新版5.0.9
      4. -
    4. 升级SpringBoot到最新版本2.0.5
      5. -
    5. 优化开始/结束时间校验限制
      6. -
    6. 重置密码参数表中获取默认值
      7. -
    7. 修复头像修改显示问题
      8. -
    8. 新增数据权限过滤注解
      9. -
    9. 新增表格检索折叠按钮
      10. -
    10. 新增清空（登录、操作、调度）日志
      11. -
    11. 固定按钮位置（提交/关闭）
      12. -
    12. 部门/菜单支持（展开/折叠）
      13. -
    13. 部分细节调整优化
      14. -
    14. 项目采用分模块
      15. -
    -
    -
    -
    -
    -
    -
    - v2.4.02018.09.03 -
    -
    -
    -
    -
      -
    1. 支持部门多级查询
      2. -
    2. 修复菜单状态查询无效
      3. -
    3. 支持IP地址开关
      4. -
    4. 支持XSS开关
      5. -
    5. 记录日志异步处理
      6. -
    6. 字典回显样式更改为下拉框
      7. -
    7. 菜单类型必填校验
      8. -
    8. 修复在线用户排序报错
      9. -
    9. 增加重置按钮
      10. -
    10. 支持注解导入数据
      11. -
    11. 支持弹层外区域关闭
      12. -
    12. 备注更换为文本区域
      13. -
    13. 新增角色逻辑删除
      14. -
    14. 新增部门逻辑删除
      15. -
    15. 支持部门数据权限
      16. -
    16. 管理员默认拥有所有授权
      17. -
    17. 字典数据采用分页
      18. -
    18. 部分细节调整优化
      19. -
    -
    -
    -
    -
    -
    -
    - v2.3.02018.08.06 -
    -
    -
    -
    -
      -
    1. 支持表格不分页开关控制
      2. -
    2. 修改字典类型同步修改字典数据
      3. -
    3. 代码生成新增修改后缀处理
      4. -
    4. 代码生成新增实体toString
      5. -
    5. 代码生成非字符串去除!=''
      6. -
    6. 导出数据前加载遮罩层
      7. -
    7. 部门删除校验条件修改
      8. -
    8. 搜索查询下载优化
      9. -
    9. 手机打开弹出层自适应
      10. -
    10. 角色岗位禁用显示置灰
      11. -
    11. 角色禁用不显示菜单
      12. -
    12. 新增导出权限
      13. -
    13. 角色权限唯一校验
      14. -
    14. 岗位名称编码唯一校验
      15. -
    15. TreeTable优化
      16. -
    16. 支持多数据源
      17. -
    17. 其他细节优化
      18. -
    -
    -
    -
    -
    -
    -
    - v2.2.02018.07.23 -
    -
    -
    -
    -
      -
    1. 修复批量生成代码异常问题
      2. -
    2. 修复定时器保存失败问题
      3. -
    3. 修复热部署转换问题
      4. -
    4. 支持查询菜单管理，部门管理
      5. -
    5. 大多数功能支持时间查询
      6. -
    6. 自定义导出注解自动匹配column
      7. -
    7. 新增任务执行策略
      8. -
    8. 操作详细动态显示类型
      9. -
    9. 支持动态回显字典数据
      10. -
    10. 后台代码优化调整
      11. -
    11. 其他细节优化
      12. -
    -
    -
    -
    -
    -
    -
    - v2.1.02018.07.10 -
    -
    -
    -
    -
      -
    1. 新增登录超时提醒
      2. -
    2. 修复定时器热部署转换问题
      3. -
    3. 修复登录验证码校验无效问题
      4. -
    4. 定时任务新增立即执行一次
      5. -
    5. 存在字典数据不允许删除字典
      6. -
    6. 字典数据支持按名称查询
      7. -
    7. 代码生成增加日志注解&表格优化
      8. -
    8. 修复用户逻辑删除后能登录问题
      9. -
    9. 表格支持多字段动态排序
      10. -
    10. 支持三级菜单显示
      11. -
    11. 新增ry.sh启动程序脚本
      12. -
    12. 其他细节优化
      13. -
    -
    -
    -
    -
    -
    -
    - v2.0.02018.07.02 -
    -
    -
    -
    -
      -
    1. 升级SpringBoot到最新版本2.0.3
      2. -
    2. 新增公告管理
      3. -
    3. 表单校验示提体验优化
      4. -
    4. 前端通用方法封装调整
      5. -
    5. 前端去除js文件，合并到html
      6. -
    6. 操作加载遮罩层
      7. -
    7. 支持全屏模式操作
      8. -
    8. 支持注解导出数据
      9. -
    9. 系统支持多查询&下载
      10. -
    10. 系统样式调整
      11. -
    -
    -
    -
    -
    -
    -
    - v1.1.62018.06.04 -
    -
    -
    -
    -
      -
    1. 新增用户列表部门列
      2. -
    2. 新增登录地点
      3. -
    3. 新增swagger
      4. -
    4. 修复排序数字校验
      5. -
    5. 优化头像上传文件类型限定为图片
      6. -
    6. 新增XSS过滤
      7. -
    7. 新增热部署提高开发效率
      8. -
    8. 修复treegrid居中无效
      9. -
    9. 角色多条件查询
      10. -
    -
    -
    -
    -
    -
    -
    - v1.1.52018.05.28 -
    -
    -
    -
    -
      -
    1. 优化登录失败刷新验证码
      2. -
    2. 新增用户登录地址时间
      3. -
    3. 修复ajax超时退出问题
      4. -
    4. 新增html调用数据字典(若依首创)
      5. -
    5. 调整系统部分样式
      6. -
    6. 新增用户逻辑删除
      7. -
    7. 新增管理员不允许删除修改
      8. -
    8. 升级bootstrapTable到最新版本1.12.1
      9. -
    9. 升级layer到最新版本3.1.1
      10. -
    -
    -
    -
    -
    -
    -
    - v1.1.42018.05.20 -
    -
    -
    -
    -
      -
    1. 新增参数管理
      2. -
    2. 修复头像上传bug
      3. -
    3. 手机邮箱唯一校验
      4. -
    4. 支持手机邮箱登录
      5. -
    5. 代码生成优化
      6. -
    6. 支持模糊查询
      7. -
    7. 支持切换主题皮肤
      8. -
    8. 修改权限即时生效
      9. -
    9. 修复页签Tab关闭问题
      10. -
    -
    -
    -
    -
    -
    -
    - v1.1.32018.05.14 -
    -
    -
    -
    -
      -
    1. 新增验证码（数组计算、字符验证）
      2. -
    2. 新增cookie记住我
      3. -
    3. 新增头像上传
      4. -
    4. 用户名密码长度限制
      5. -
    5. 通用字段提取
      6. -
    6. 支持自定义条件查询
      7. -
    7. 部门名称必填、时间格式调整
      8. -
    8. 其他细节优化
      9. -
    -
    -
    -
    -
    -
    -
    - v1.1.22018.05.07 -
    -
    -
    -
    -
      -
    1. 新增个人信息修改
      2. -
    2. 菜单存在子菜单不允许删除
      3. -
    3. 菜单分配角色不允许删除
      4. -
    4. 角色分配人员不允许删除
      5. -
    5. 岗位使用后不允许删除
      6. -
    6. 保证用户的数据完整性加入事物
      7. -
    7. 新增环境使用手册、数据建模
      8. -
    8. Thymeleaf升级到3.0
      9. -
    9. 支持非ROOT部署
      10. -
    -
    -
    -
    -
    -
    -
    - v1.1.12018.04.23 -
    -
    -
    -
    -
      -
    1. 新增表单构建器
      2. -
    2. 代码生成优化
      3. -
    3. 支持新增主部门
      4. -
    4. 支持选择上级部门、上级菜单
      5. -
    5. 新增字典管理单条删除
      6. -
    6. 优化一些其他细节
      7. -
    -
    -
    -
    -
    -
    -
    - v1.1.02018.04.20 -
    -
    -
    -
    -
      -
    1. 支持密码盐
      2. -
    2. 支持新增主目录
      3. -
    3. 支持批量生成代码
      4. -
    4. 支持表格导出(csv、txt、doc、excel)
      5. -
    5. 自动适应宽高模式窗体
      6. -
    6. 重复校验(角色名、菜单名、部门名)
      7. -
    7. 优化一些其他细节
      8. -
    -
    -
    -
    -
    -
    -
    - v1.0.92018.04.14 -
    -
    -
    -
    -
      -
    1. 新增代码生成(生成包括 java、html、js、xml、sql)
      2. -
    2. 新增按钮权限控制隐藏(若依首创)
      3. -
    -
    -
    -
    -
    -
    -
    - v1.0.82018.04.08 -
    -
    -
    -
    -
      -
    1. 新增定时任务(新增、修改、删除、查询、启动/暂停)
      2. -
    2. 新增调度日志(查询、删除)
      3. -
    -
    -
    -
    -
    -
    -
    - v1.0.72018.04.04 -
    -
    -
    -
    -
      -
    1. 新增岗位管理(新增、修改、删除、查询)
      2. -
    2. 优化用户管理，菜单管理部分细节
      3. -
    -
    -
    -
    -
    -
    -
    - v1.0.62018.03.15 -
    -
    -
    -
    -
      -
    1. 新增字典管理(新增、删除、修改、查询、数据选择)
      2. -
    2. 新增用户密码重置
      3. -
    3. 优化一些其他细节
      4. -
    -
    -
    -
    -
    -
    -
    - v1.0.52018.03.12 -
    -
    -
    -
    -
      -
    1. 新增菜单管理(新增、删除、修改、查询、图标选择)
      2. -
    2. 部门管理优化(添加责任人、联系电话、邮箱、修改者)
      3. -
    -
    -
    -
    -
    -
    -
    - v1.0.42018.03.11 -
    -
    -
    -
    -
      -
    1. 新增角色管理(新增、删除、修改、查询、菜单选择)
      2. -
    -
    -
    -
    -
    -
    -
    - v1.0.32018.03.08 -
    -
    -
    -
    -
      -
    1. 新增用户管理(新增、删除、修改、查询、部门选择)
      2. -
    -
    -
    -
    -
    -
    -
    - v1.0.22018.03.04 -
    -
    -
    -
    -
      -
    1. 新增部门管理 (新增、删除、修改、查询)
      2. -
    -
    -
    -
    -
    -
    -
    - v1.0.12018.03.03 -
    -
    -
    -
    -
      -
    1. 新增在线用户 (批量强退、单条强退、查询)
      2. -
    2. 新增登录日志 (批量删除、查询)
      3. -
    3. 新增操作日志 (批量删除、查询、详细)
      4. -
    4. 新增数据监控 (监控DB池连接和SQL的执行)
      5. -
    -
    -
    -
    -
    -
    -

    - v1.0.02018.03.01 -

    -
    -
    -
    -
      -
    1. 若依管理系统正式发布。
      2. -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    捐赠
    -
    -
    -
    - 请作者喝杯咖啡（点击图片放大） -
    -

    - 请使用手机支付宝或者微信扫码支付 - -

    -
    -
    -
    -
    -
    - - - - +
    +
    +
    +
    +
    +
    +
    +
    + 技术选型 +
    +
    +
    +
      +
    1. 核心框架：Spring Boot
      2. +
    2. 安全框架：Apache Shiro
      3. +
    3. 模板引擎：Thymeleaf
      4. +
    4. 持久层框架：MyBatis
      5. +
    5. 定时任务:Quartz
      6. +
    6. 数据库连接池：Druid
      7. +
    7. 工具类：Fastjson
      8. +
    +
    +

    +

    + +
    +
    +
    +
    +
    + + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java index d22bccbd3..b771ff4a9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java @@ -56,4 +56,9 @@ public enum BusinessType * 清空 */ CLEAN, + + /** + * 清空 + */ + DROP, } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java index 4b5341d19..ef66ad86b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java @@ -15,5 +15,20 @@ public enum DataSourceType /** * 从库 */ - SLAVE + SLAVE, + + /** + * SQLSERVER数据库 + */ + SQLSVR, + + /** + * TOPPROD_DS_REPORT数据库 + */ + TOPPRODDSREPORT, + + /** + * TOPTEST_DS_REPORT数据库 + */ + TOPTESTDSREPORT } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java index b4c356bb0..3a6d1f99f 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java @@ -49,6 +49,39 @@ public class DruidConfig return druidProperties.dataSource(dataSource); } + //add yangbo 新增SQLSERVER数据源　－－Begin + @Bean + @ConfigurationProperties("spring.datasource.druid.sqlsvr") + @ConditionalOnProperty(prefix = "spring.datasource.druid.sqlsvr", name = "enabled", havingValue = "true") + public DataSource sqlsvrDataSource(DruidProperties druidProperties) + { + DruidDataSource dataSource = DruidDataSourceBuilder.create().build(); + return druidProperties.dataSource(dataSource); + } + //add yangbo 新增SQLSERVER数据源　－－End + + //add yangbo 新增topprod ds_report数据源　－－Begin + @Bean + @ConfigurationProperties("spring.datasource.druid.topproddsreport") + @ConditionalOnProperty(prefix = "spring.datasource.druid.topproddsreport", name = "enabled", havingValue = "true") + public DataSource topproddsreportDataSource(DruidProperties druidProperties) + { + DruidDataSource dataSource = DruidDataSourceBuilder.create().build(); + return druidProperties.dataSource(dataSource); + } + //add yangbo 新增topprod ds_report数据源　－－End + + //add yangbo 新增toptest ds_report数据源　－－Begin + @Bean + @ConfigurationProperties("spring.datasource.druid.toptestdsreport") + @ConditionalOnProperty(prefix = "spring.datasource.druid.toptestdsreport", name = "enabled", havingValue = "true") + public DataSource toptestdsreportDataSource(DruidProperties druidProperties) + { + DruidDataSource dataSource = DruidDataSourceBuilder.create().build(); + return druidProperties.dataSource(dataSource); + } + //add yangbo 新增toptest ds_report数据源　－－End + @Bean(name = "dynamicDataSource") @Primary public DynamicDataSource dataSource(DataSource masterDataSource) @@ -56,6 +89,11 @@ public class DruidConfig Map targetDataSources = new HashMap<>(); targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource); setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource"); + //add yangbo 新增SQLSERVER、topproddsreport、toptestdsreport数据源 --Begin + setDataSource(targetDataSources, DataSourceType.SQLSVR.name(), "sqlsvrDataSource"); + setDataSource(targetDataSources, DataSourceType.TOPPRODDSREPORT.name(), "topproddsreportDataSource"); + setDataSource(targetDataSources, DataSourceType.TOPTESTDSREPORT.name(), "toptestdsreportDataSource"); + //add yangbo 新增SQLSERVER、topproddsreport、toptestdsreport数据源　－－End return new DynamicDataSource(masterDataSource, targetDataSources); } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java index d69672785..a3a233584 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java @@ -274,6 +274,8 @@ public class ShiroConfig filterChainDefinitionMap.put("/js/**", "anon"); filterChainDefinitionMap.put("/ruoyi/**", "anon"); filterChainDefinitionMap.put("/captcha/captchaImage**", "anon"); + filterChainDefinitionMap.put("/test/**", "anon"); //为防便测试，配置test路径可以匿名访问 + filterChainDefinitionMap.put("/anon/**", "anon"); //为防便测试，配置anon路径可以匿名访问 // 退出 logout地址，shiro去清除session filterChainDefinitionMap.put("/logout", "logout"); // 不需要拦截的访问