From 41b55872f783568f4923097e19e853422ff7ee55 Mon Sep 17 00:00:00 2001 From: mhsnet Date: Wed, 24 May 2023 10:42:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A1=88=E4=BE=8B=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=8A=E5=90=8E=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgw/controller/YxgwCaseController.java | 32 +++---- .../controller/YxgwSolutionController.java | 32 +++---- .../modules/demo/yxgw/entity/YxgwCase.java | 53 ++++++----- .../demo/yxgw/entity/YxgwSolution.java | 38 +++++--- .../demo/yxgw/mapper/YxgwCaseMapper.java | 4 +- .../demo/yxgw/mapper/YxgwSolutionMapper.java | 4 +- .../demo/yxgw/service/IYxgwCaseService.java | 4 +- .../yxgw/service/IYxgwSolutionService.java | 4 +- .../service/impl/YxgwCaseServiceImpl.java | 4 +- .../service/impl/YxgwSolutionServiceImpl.java | 4 +- .../modules/demo/yxgw/vue3/YxgwCase.data.ts | 80 ++++++++++++----- .../modules/demo/yxgw/vue3/YxgwCaseList.vue | 22 ++++- .../demo/yxgw/vue3/YxgwCase_menu_insert.sql | 14 +-- .../demo/yxgw/vue3/YxgwSolution.data.ts | 46 ++++++++-- .../demo/yxgw/vue3/YxgwSolutionList.vue | 4 +- .../yxgw/vue3/YxgwSolution_menu_insert.sql | 14 +-- .../demo/yxgwf/controller/CaseController.java | 25 +++++- .../jeecg/modules/demo/yxgwf/entity/Case.java | 89 +++++++++++++++++++ .../modules/demo/yxgwf/mapper/CaseMapper.java | 14 +++ .../demo/yxgwf/mapper/xml/CaseMapper.xml | 5 ++ .../demo/yxgwf/service/ICaseService.java | 14 +++ .../yxgwf/service/impl/CaseServiceImpl.java | 18 ++++ .../demo/yxgwf/mapper/xml/CaseMapper.xml | 5 ++ .../src/views/yxgw/YxgwCase.data.ts | 80 ++++++++++++----- .../src/views/yxgw/YxgwCaseList.vue | 22 ++++- .../src/views/yxgw/YxgwCase_menu_insert.sql | 14 +-- .../src/views/yxgw/YxgwSolution.data.ts | 46 ++++++++-- .../src/views/yxgw/YxgwSolutionList.vue | 4 +- .../views/yxgw/YxgwSolution_menu_insert.sql | 14 +-- 29 files changed, 536 insertions(+), 173 deletions(-) create mode 100644 linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/entity/Case.java create mode 100644 linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/CaseMapper.java create mode 100644 linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/xml/CaseMapper.xml create mode 100644 linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/ICaseService.java create mode 100644 linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/impl/CaseServiceImpl.java create mode 100644 linus-boot/linus-module-demo/target/classes/org/jeecg/modules/demo/yxgwf/mapper/xml/CaseMapper.xml diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/controller/YxgwCaseController.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/controller/YxgwCaseController.java index d7070dd..493c4c5 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/controller/YxgwCaseController.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/controller/YxgwCaseController.java @@ -38,12 +38,12 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; /** - * @Description: 解决方案客户案例 + * @Description: 客户案例 * @Author: jeecg-boot - * @Date: 2023-05-17 + * @Date: 2023-05-24 * @Version: V1.0 */ -@Api(tags="解决方案客户案例") +@Api(tags="客户案例") @RestController @RequestMapping("/yxgw/yxgwCase") @Slf4j @@ -60,8 +60,8 @@ public class YxgwCaseController extends JeecgController> queryPageList(YxgwCase yxgwCase, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -79,8 +79,8 @@ public class YxgwCaseController extends JeecgController add(@RequestBody YxgwCase yxgwCase) { @@ -94,8 +94,8 @@ public class YxgwCaseController extends JeecgController edit(@RequestBody YxgwCase yxgwCase) { @@ -109,8 +109,8 @@ public class YxgwCaseController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { @@ -124,8 +124,8 @@ public class YxgwCaseController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -139,8 +139,8 @@ public class YxgwCaseController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { YxgwCase yxgwCase = yxgwCaseService.getById(id); @@ -159,7 +159,7 @@ public class YxgwCaseController extends JeecgController> queryPageList(YxgwSolution yxgwSolution, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -79,8 +79,8 @@ public class YxgwSolutionController extends JeecgController add(@RequestBody YxgwSolution yxgwSolution) { @@ -94,8 +94,8 @@ public class YxgwSolutionController extends JeecgController edit(@RequestBody YxgwSolution yxgwSolution) { @@ -109,8 +109,8 @@ public class YxgwSolutionController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { @@ -124,8 +124,8 @@ public class YxgwSolutionController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -139,8 +139,8 @@ public class YxgwSolutionController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { YxgwSolution yxgwSolution = yxgwSolutionService.getById(id); @@ -159,7 +159,7 @@ public class YxgwSolutionController extends JeecgController { diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/mapper/YxgwSolutionMapper.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/mapper/YxgwSolutionMapper.java index 0be7a13..546678f 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/mapper/YxgwSolutionMapper.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/mapper/YxgwSolutionMapper.java @@ -7,9 +7,9 @@ import org.jeecg.modules.demo.yxgw.entity.YxgwSolution; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 行业解决方案 + * @Description: 解决方案 * @Author: jeecg-boot - * @Date: 2023-05-17 + * @Date: 2023-05-24 * @Version: V1.0 */ public interface YxgwSolutionMapper extends BaseMapper { diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/IYxgwCaseService.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/IYxgwCaseService.java index 4cc597b..e841009 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/IYxgwCaseService.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/IYxgwCaseService.java @@ -4,9 +4,9 @@ import org.jeecg.modules.demo.yxgw.entity.YxgwCase; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 解决方案客户案例 + * @Description: 客户案例 * @Author: jeecg-boot - * @Date: 2023-05-17 + * @Date: 2023-05-24 * @Version: V1.0 */ public interface IYxgwCaseService extends IService { diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/IYxgwSolutionService.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/IYxgwSolutionService.java index 7d9ab37..4f6dbff 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/IYxgwSolutionService.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/IYxgwSolutionService.java @@ -4,9 +4,9 @@ import org.jeecg.modules.demo.yxgw.entity.YxgwSolution; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 行业解决方案 + * @Description: 解决方案 * @Author: jeecg-boot - * @Date: 2023-05-17 + * @Date: 2023-05-24 * @Version: V1.0 */ public interface IYxgwSolutionService extends IService { diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/impl/YxgwCaseServiceImpl.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/impl/YxgwCaseServiceImpl.java index c8c5714..33eca8d 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/impl/YxgwCaseServiceImpl.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/impl/YxgwCaseServiceImpl.java @@ -8,9 +8,9 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: 解决方案客户案例 + * @Description: 客户案例 * @Author: jeecg-boot - * @Date: 2023-05-17 + * @Date: 2023-05-24 * @Version: V1.0 */ @Service diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/impl/YxgwSolutionServiceImpl.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/impl/YxgwSolutionServiceImpl.java index 44c12cc..d984f39 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/impl/YxgwSolutionServiceImpl.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/service/impl/YxgwSolutionServiceImpl.java @@ -8,9 +8,9 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: 行业解决方案 + * @Description: 解决方案 * @Author: jeecg-boot - * @Date: 2023-05-17 + * @Date: 2023-05-24 * @Version: V1.0 */ @Service diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/vue3/YxgwCase.data.ts b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/vue3/YxgwCase.data.ts index 2f83cf8..faa89b4 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/vue3/YxgwCase.data.ts +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/vue3/YxgwCase.data.ts @@ -5,30 +5,49 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '行业ID', + title: '客户名', align:"center", - dataIndex: 'industryId_dictText' + dataIndex: 'customer' }, { - title: '客户', + title: '案例副标题', align:"center", - dataIndex: 'customer' + dataIndex: 'title' }, { - title: '标题', + title: '所属行业', align:"center", - dataIndex: 'title' + dataIndex: 'industry', + customRender:({text}) => { + return render.renderCategoryTree(text,'C03A02') + }, }, { - title: '案例描述', + title: '案例图片', align:"center", - dataIndex: 'des' + dataIndex: 'img', + customRender:render.renderImage, }, { - title: '案例内容', + title: '发布日期', + align:"center", + dataIndex: 'date', + customRender:({text}) =>{ + return !text?"":(text.length>10?text.substr(0,10):text) + }, + }, + { + title: '是否发布', + align:"center", + dataIndex: 'isshow', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { + title: '案例描述', align:"center", - dataIndex: 'article', - slots: { customRender: 'htmlSlot' }, + dataIndex: 'des' }, ]; //查询数据 @@ -37,23 +56,42 @@ export const searchFormSchema: FormSchema[] = [ //表单数据 export const formSchema: FormSchema[] = [ { - label: '行业ID', - field: 'industryId', - component: 'JDictSelectTag', - componentProps:{ - dictCode:"yxgw_solution,name,id" - }, - }, - { - label: '客户', + label: '客户名', field: 'customer', component: 'Input', }, { - label: '标题', + label: '案例副标题', field: 'title', component: 'Input', }, + { + label: '所属行业', + field: 'industry', + component: 'JCategorySelect', + componentProps:{ + pcode:"C03A02", //TODO back和事件未添加,暂时有问题 + }, + }, + { + label: '案例图片', + field: 'img', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '发布日期', + field: 'date', + component: 'DatePicker', + }, + { + label: '是否发布', + field: 'isshow', + component: 'JSwitch', + componentProps:{ + }, + }, { label: '案例描述', field: 'des', diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/vue3/YxgwCaseList.vue b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/vue3/YxgwCaseList.vue index 2c4a484..13a7023 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/vue3/YxgwCaseList.vue +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgw/vue3/YxgwCaseList.vue @@ -52,13 +52,16 @@ import {columns, searchFormSchema} from './YxgwCase.data'; import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './YxgwCase.api'; import { downloadFile } from '/@/utils/common/renderUtils'; + import { loadCategoryData } from '/@/api/common/api' + import { getAuthCache, setAuthCache } from '/@/utils/auth'; + import { DB_DICT_DATA_KEY } from '/@/enums/cacheEnum'; const checkedKeys = ref>([]); //注册model const [registerModal, {openModal}] = useModal(); //注册table数据 const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ tableProps:{ - title: '解决方案客户案例', + title: '客户案例', api: list, columns, canResize:false, @@ -78,7 +81,7 @@ }, }, exportConfig: { - name:"解决方案客户案例", + name:"客户案例", url: getExportUrl, }, importConfig: { @@ -166,6 +169,21 @@ } + /** + * 初始化字典配置 + */ + function initDictConfig(){ + loadCategoryData({code:'C03A02'}).then((res) => { + if (res) { + let allDictDate = getAuthCache(DB_DICT_DATA_KEY); + if(!allDictDate['C03A02']){ + Object.assign(allDictDate,{'C03A02':res}) + } + setAuthCache(DB_DICT_DATA_KEY,allDictDate) + } + }) + } + initDictConfig();