添加优势

company-manager/src/main/java/com/mortals/xhx/module/advantage/dao/AdvantageDao.java

+package com.mortals.xhx.module.advantage.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.advantage.model.AdvantageEntity;
+import java.util.List;
+/**
+* 公司优势特点Dao
+* 公司优势特点 DAO接口
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+
+public interface  AdvantageDao extends ICRUDDao<AdvantageEntity,Long>{
+
+
+}

company-manager/src/main/java/com/mortals/xhx/module/advantage/dao/ibatis/AdvantageDaoImpl.java

+package com.mortals.xhx.module.advantage.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.advantage.dao.AdvantageDao;
+import com.mortals.xhx.module.advantage.model.AdvantageEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 公司优势特点DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Repository("advantageDao")
+public class AdvantageDaoImpl extends BaseCRUDDaoMybatis<AdvantageEntity,Long> implements AdvantageDao {
+
+
+
+}

company-manager/src/main/java/com/mortals/xhx/module/advantage/model/AdvantageEntity.java

+package com.mortals.xhx.module.advantage.model;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.advantage.model.vo.AdvantageVo;
+import lombok.Data;
+/**
+* 公司优势特点实体对象
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Data
+public class AdvantageEntity extends AdvantageVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 标题
+    */
+    private String title;
+    /**
+    * 内容
+    */
+    private String content;
+    /**
+    * 图片
+    */
+    private String imagePath;
+    /**
+    * 备注
+    */
+    private String remark;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof AdvantageEntity) {
+            AdvantageEntity tmp = (AdvantageEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.title = "";
+            this.content = "";
+            this.imagePath = "";
+            this.remark = "";
+    }
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/advantage/model/vo/AdvantageVo.java

+package com.mortals.xhx.module.advantage.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.advantage.model.AdvantageEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 公司优势特点视图对象
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Data
+public class AdvantageVo extends BaseEntityLong {
+
+    /** id列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/advantage/service/AdvantageService.java

+package com.mortals.xhx.module.advantage.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.advantage.model.AdvantageEntity;
+import com.mortals.xhx.module.advantage.dao.AdvantageDao;
+/**
+* AdvantageService
+*
+* 公司优势特点 service接口
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+public interface AdvantageService extends ICRUDService<AdvantageEntity,Long>{
+
+    AdvantageDao getDao();
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/advantage/service/impl/AdvantageServiceImpl.java

+package com.mortals.xhx.module.advantage.service.impl;
+import org.springframework.beans.BeanUtils;
+import java.util.function.Function;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.advantage.dao.AdvantageDao;
+import com.mortals.xhx.module.advantage.model.AdvantageEntity;
+import com.mortals.xhx.module.advantage.service.AdvantageService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* AdvantageService
+* 公司优势特点 service实现
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Service("advantageService")
+@Slf4j
+public class AdvantageServiceImpl extends AbstractCRUDServiceImpl<AdvantageDao, AdvantageEntity, Long> implements AdvantageService {
+    
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/advantage/web/AdvantageController.java

+package com.mortals.xhx.module.advantage.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.advantage.model.AdvantageEntity;
+import com.mortals.xhx.module.advantage.service.AdvantageService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+import com.mortals.xhx.common.code.*;
+/**
+*
+* 公司优势特点
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@RestController
+@RequestMapping("advantage")
+public class AdvantageController extends BaseCRUDJsonBodyMappingController<AdvantageService,AdvantageEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public AdvantageController(){
+        super.setModuleDesc( "公司优势特点");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/article/model/vo/ArticleVo.java

@@ -19,5 +19,7 @@ public class ArticleVo extends BaseEntityLong {
     /** 文章id列表 */
     private List <Long> idList;
 
+    private List <Long> idNotList;
+
 
 }
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/article/web/ArticleController.java

 package com.mortals.xhx.module.article.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,5 +48,10 @@ public class ArticleController extends BaseCRUDJsonBodyMappingController<Article
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(ArticleEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        query.setOrderColList(Arrays.asList(new OrderCol("create_time", "desc")));
 
+    }
 }
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/company/web/CompanyController.java

 package com.mortals.xhx.module.company.web;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -47,4 +49,12 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
     }
 
 
+    @Override
+    protected void saveBefore(CompanyEntity entity, Map<String, Object> model, Context context) throws AppException {
+        CompanyEntity companyEntity = this.service.selectOne(new CompanyEntity());
+        if(!ObjectUtils.isEmpty(companyEntity)){
+            entity.setId(companyEntity.getId());
+        }
+        super.saveBefore(entity, model, context);
+    }
 }
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/service/dao/ServiceDao.java

+package com.mortals.xhx.module.service.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.service.model.ServiceEntity;
+import java.util.List;
+/**
+* 公司服务Dao
+* 公司服务 DAO接口
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+
+public interface  ServiceDao extends ICRUDDao<ServiceEntity,Long>{
+
+
+}

company-manager/src/main/java/com/mortals/xhx/module/service/dao/ibatis/ServiceDaoImpl.java

+package com.mortals.xhx.module.service.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.service.dao.ServiceDao;
+import com.mortals.xhx.module.service.model.ServiceEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 公司服务DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Repository("serviceDao")
+public class ServiceDaoImpl extends BaseCRUDDaoMybatis<ServiceEntity,Long> implements ServiceDao {
+
+
+
+}

company-manager/src/main/java/com/mortals/xhx/module/service/model/ServiceEntity.java

+package com.mortals.xhx.module.service.model;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.service.model.vo.ServiceVo;
+import lombok.Data;
+/**
+* 公司服务实体对象
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Data
+public class ServiceEntity extends ServiceVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 标题
+    */
+    private String title;
+    /**
+    * 内容
+    */
+    private String content;
+    /**
+    * 图标
+    */
+    private String icon;
+    /**
+    * 备注
+    */
+    private String remark;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof ServiceEntity) {
+            ServiceEntity tmp = (ServiceEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.title = "";
+            this.content = "";
+            this.icon = "";
+            this.remark = "";
+    }
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/service/model/vo/ServiceVo.java

+package com.mortals.xhx.module.service.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.service.model.ServiceEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 公司服务视图对象
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Data
+public class ServiceVo extends BaseEntityLong {
+
+    /** id列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/service/service/ServiceService.java

+package com.mortals.xhx.module.service.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.service.model.ServiceEntity;
+import com.mortals.xhx.module.service.dao.ServiceDao;
+/**
+* ServiceService
+*
+* 公司服务 service接口
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+public interface ServiceService extends ICRUDService<ServiceEntity,Long>{
+
+    ServiceDao getDao();
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/service/service/impl/ServiceServiceImpl.java

+package com.mortals.xhx.module.service.service.impl;
+import org.springframework.beans.BeanUtils;
+import java.util.function.Function;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.service.dao.ServiceDao;
+import com.mortals.xhx.module.service.model.ServiceEntity;
+import com.mortals.xhx.module.service.service.ServiceService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* ServiceService
+* 公司服务 service实现
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Service("serviceService")
+@Slf4j
+public class ServiceServiceImpl extends AbstractCRUDServiceImpl<ServiceDao, ServiceEntity, Long> implements ServiceService {
+    
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/service/web/ServiceController.java

+package com.mortals.xhx.module.service.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.service.model.ServiceEntity;
+import com.mortals.xhx.module.service.service.ServiceService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+import com.mortals.xhx.common.code.*;
+/**
+*
+* 公司服务
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@RestController
+@RequestMapping("service")
+public class ServiceController extends BaseCRUDJsonBodyMappingController<ServiceService,ServiceEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public ServiceController(){
+        super.setModuleDesc( "公司服务");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/slideshow/model/SlideshowEntity.java

@@ -10,26 +10,34 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.slideshow.model.vo.SlideshowVo;
 import lombok.Data;
 /**
-* 轮播实体对象
-*
-* @author zxfei
-* @date 2024-11-25
-*/
+ * 轮播实体对象
+ *
+ * @author zxfei
+ * @date 2024-11-29
+ */
 @Data
 public class SlideshowEntity extends SlideshowVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 图片地址
-    */
+     * 图片地址
+     */
     private String imageUrl;
     /**
-    * 描述
-    */
+     * 描述
+     */
     private String introduction;
+    /**
+     * 图标
+     */
+    private String icon;
+    /**
+     * 名称
+     */
+    private String name;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -37,14 +45,16 @@ public class SlideshowEntity extends SlideshowVo {
         if (obj instanceof SlideshowEntity) {
             SlideshowEntity tmp = (SlideshowEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
     public void initAttrValue(){
-            this.imageUrl = "";
-            this.introduction = "";
+        this.imageUrl = "";
+        this.introduction = "";
+        this.icon = "";
+        this.name = "";
     }
 }
\ No newline at end of file

company-manager/src/test/java/com/mortals/httpclient/advantage/AdvantageController.http

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###公司优势特点列表
+POST {{baseUrl}}/advantage/list
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###公司优势特点更新与保存
+POST {{baseUrl}}/advantage/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "title":"dvkEWw",
+        "content":"BVanCC",
+        "imagePath":"Az0Cmo",
+        "remark":"NIamOD",
+}
+
+> {%
+client.global.set("Advantage_id", JSON.parse(response.body).data.id);
+%}
+
+###公司优势特点查看
+GET {{baseUrl}}/advantage/info?id=1
+
+###公司优势特点编辑
+GET {{baseUrl}}/advantage/edit?id=1
+Accept: application/json
+
+
+###公司优势特点删除
+GET {{baseUrl}}/advantage/delete?id=1
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

company-manager/src/test/java/com/mortals/httpclient/article/ArticleController.http

@@ -14,12 +14,14 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 ###文章列表
-POST {{baseUrl}}/article/list
+POST {{baseUrl}}/article/interlist
 Content-Type: application/json
 
 {
+    "idNotList": [1],
     "page":1,
-    "size":10
+    "size":2,
+     "orderColList":[{"colName": "create_time","sortKind": "desc"}]
 }
 
 

company-manager/src/test/java/com/mortals/httpclient/service/ServiceController.http

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###公司服务列表
+POST {{baseUrl}}/service/list
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###公司服务更新与保存
+POST {{baseUrl}}/service/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "title":"ctuA6k",
+        "content":"1L97zF",
+        "icon":"Nzancw",
+        "remark":"cD6k6y",
+}
+
+> {%
+client.global.set("Service_id", JSON.parse(response.body).data.id);
+%}
+
+###公司服务查看
+GET {{baseUrl}}/service/info?id=1
+
+###公司服务编辑
+GET {{baseUrl}}/service/edit?id=1
+Accept: application/json
+
+
+###公司服务删除
+GET {{baseUrl}}/service/delete?id=1
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

company-manager/src/test/java/httpclient/http-client.env.json

 {
   "local": {
-    "baseUrl": "http://127.0.0.1:18000/m"
+    "baseUrl": "http://127.0.0.1:18001/m"
   },
   "dev": {
-    "baseUrl": "http://127.0.0.1:18000/m"
+    "baseUrl": "http://127.0.0.1:18001/m"
   },
   "test": {
     "baseUrl": "http://192.168.0.250:8082/m"