diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0aa1bbe..d5ea3d5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,155 +1,61 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + - - - + + + @@ -285,7 +195,7 @@ - + 1731385713383 @@ -343,7 +253,21 @@ - @@ -370,19 +294,20 @@ - - - + - + @@ -391,93 +316,101 @@ - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + + + + + - + - + - + file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java - 206 + 237 diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index 6055b65..1c8a367 100644 --- a/admin-hanhai-vue/.env.development +++ b/admin-hanhai-vue/.env.development @@ -1,4 +1,5 @@ NODE_ENV=development +//VUE_APP_API_BASE_URL=https://carrentadmin.augcl.com/carrent-admin/ VUE_APP_API_BASE_URL=http://localhost:8003/carrent-admin/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index a5aae84..1d9206d 100644 --- a/admin-hanhai-vue/.env.production +++ b/admin-hanhai-vue/.env.production @@ -1,4 +1,5 @@ NODE_ENV=production +//VUE_APP_API_BASE_URL=https://carrentadmin.augcl.com/carrent-admin/ VUE_APP_API_BASE_URL=http://localhost:8003/carrent-admin/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml b/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml index 4e855fc..f2a1109 100644 --- a/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml +++ b/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml @@ -214,6 +214,7 @@ + @@ -248,7 +249,6 @@ - diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml index 23004b3..0d06433 100644 --- a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml +++ b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml @@ -239,6 +239,7 @@ + @@ -273,7 +274,6 @@ - diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml index 1f0efd3..bfc382d 100644 --- a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml +++ b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml @@ -225,6 +225,7 @@ + @@ -259,7 +260,6 @@ - diff --git a/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml b/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml index ae7037c..d9f3c37 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml +++ b/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml @@ -235,6 +235,7 @@ + @@ -259,7 +260,6 @@ - diff --git a/jeecg-boot-base/jeecg-boot-base-core/pom.xml b/jeecg-boot-base/jeecg-boot-base-core/pom.xml index be7b740..98ec833 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/pom.xml +++ b/jeecg-boot-base/jeecg-boot-base-core/pom.xml @@ -260,6 +260,12 @@ 138 compile + + com.vaadin.external.google + android-json + 0.0.20131108.vaadin1 + compile + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/controller/CarrentCompanyController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/controller/CarrentCompanyController.java index f673bfa..58c3801 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/controller/CarrentCompanyController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/controller/CarrentCompanyController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 企业信息表 * @Author: jeecg-boot - * @Date: 2024-12-03 + * @Date: 2024-12-26 * @Version: V1.0 */ @Api(tags="企业信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java index bde1e2b..473fdf0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 企业信息表 * @Author: jeecg-boot - * @Date: 2024-12-03 + * @Date: 2024-12-26 * @Version: V1.0 */ @Data @@ -67,6 +67,10 @@ public class CarrentCompany implements Serializable { @Excel(name = "营业执照", width = 15) @ApiModelProperty(value = "营业执照") private java.lang.String businessLicense; + /**状态*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + private java.lang.String status; /**关联用户*/ @Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java index 2f791ba..7a1ee1e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 企业信息表 * @Author: jeecg-boot - * @Date: 2024-12-03 + * @Date: 2024-12-26 * @Version: V1.0 */ public interface CarrentCompanyMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java index ed7a818..83db7f2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 企业信息表 * @Author: jeecg-boot - * @Date: 2024-12-03 + * @Date: 2024-12-26 * @Version: V1.0 */ public interface ICarrentCompanyService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java index e8245d8..44cb350 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 企业信息表 * @Author: jeecg-boot - * @Date: 2024-12-03 + * @Date: 2024-12-26 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue index a310300..7f3a434 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue @@ -148,6 +148,11 @@ dataIndex: 'businessLicense', scopedSlots: {customRender: 'imgSlot'} }, + { + title:'状态', + align:"center", + dataIndex: 'status' + }, { title:'关联用户', align:"center", @@ -192,6 +197,7 @@ fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''}) fieldList.push({type:'string',value:'address',text:'公司地址',dictCode:''}) fieldList.push({type:'string',value:'businessLicense',text:'营业执照',dictCode:''}) + fieldList.push({type:'string',value:'status',text:'状态',dictCode:'authentic_status'}) fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"han_hai_member,nick_name,id"}) this.superFieldList = fieldList } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue index 84566b0..8b4a6d1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue @@ -28,6 +28,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.data.ts index cc6d5c5..9d90ff0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.data.ts @@ -30,6 +30,11 @@ export const columns: BasicColumn[] = [ dataIndex: 'businessLicense', customRender:render.renderAvatar, }, + { + title: '状态', + align:"center", + dataIndex: 'status' + }, { title: '关联用户', align:"center", @@ -68,6 +73,11 @@ export const formSchema: FormSchema[] = [ componentProps:{ }, }, + { + label: '状态', + field: 'status', + component: 'Input', + }, { label: '关联用户', field: 'userId', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/controller/CarrentMileageController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/controller/CarrentMileageController.java new file mode 100644 index 0000000..1d34214 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/controller/CarrentMileageController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.carrentMileage.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.carrentMileage.entity.CarrentMileage; +import org.jeecg.modules.carrentMileage.service.ICarrentMileageService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 公里数信息表 + * @Author: jeecg-boot + * @Date: 2024-12-26 + * @Version: V1.0 + */ +@Api(tags="公里数信息表") +@RestController +@RequestMapping("/carrentMileage/carrentMileage") +@Slf4j +public class CarrentMileageController extends JeecgController { + @Autowired + private ICarrentMileageService carrentMileageService; + + /** + * 分页列表查询 + * + * @param carrentMileage + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "公里数信息表-分页列表查询") + @ApiOperation(value="公里数信息表-分页列表查询", notes="公里数信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CarrentMileage carrentMileage, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentMileage, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = carrentMileageService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param carrentMileage + * @return + */ + @AutoLog(value = "公里数信息表-添加") + @ApiOperation(value="公里数信息表-添加", notes="公里数信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CarrentMileage carrentMileage) { + carrentMileageService.save(carrentMileage); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param carrentMileage + * @return + */ + @AutoLog(value = "公里数信息表-编辑") + @ApiOperation(value="公里数信息表-编辑", notes="公里数信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CarrentMileage carrentMileage) { + carrentMileageService.updateById(carrentMileage); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "公里数信息表-通过id删除") + @ApiOperation(value="公里数信息表-通过id删除", notes="公里数信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + carrentMileageService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "公里数信息表-批量删除") + @ApiOperation(value="公里数信息表-批量删除", notes="公里数信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.carrentMileageService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "公里数信息表-通过id查询") + @ApiOperation(value="公里数信息表-通过id查询", notes="公里数信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CarrentMileage carrentMileage = carrentMileageService.getById(id); + if(carrentMileage==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(carrentMileage); + } + + /** + * 导出excel + * + * @param request + * @param carrentMileage + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CarrentMileage carrentMileage) { + return super.exportXls(request, carrentMileage, CarrentMileage.class, "公里数信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CarrentMileage.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/entity/CarrentMileage.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/entity/CarrentMileage.java new file mode 100644 index 0000000..91362ae --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/entity/CarrentMileage.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.carrentMileage.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 公里数信息表 + * @Author: jeecg-boot + * @Date: 2024-12-26 + * @Version: V1.0 + */ +@Data +@TableName("carrent_mileage") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="carrent_mileage对象", description="公里数信息表") +public class CarrentMileage implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**公里数(万)*/ + @Excel(name = "公里数(万)", width = 15) + @ApiModelProperty(value = "公里数(万)") + private java.lang.Integer mileage; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/CarrentMileageMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/CarrentMileageMapper.java new file mode 100644 index 0000000..f58b2b4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/CarrentMileageMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.carrentMileage.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.carrentMileage.entity.CarrentMileage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 公里数信息表 + * @Author: jeecg-boot + * @Date: 2024-12-26 + * @Version: V1.0 + */ +public interface CarrentMileageMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/xml/CarrentMileageMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/xml/CarrentMileageMapper.xml new file mode 100644 index 0000000..bfb14ef --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/xml/CarrentMileageMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/ICarrentMileageService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/ICarrentMileageService.java new file mode 100644 index 0000000..f803d48 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/ICarrentMileageService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.carrentMileage.service; + +import org.jeecg.modules.carrentMileage.entity.CarrentMileage; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 公里数信息表 + * @Author: jeecg-boot + * @Date: 2024-12-26 + * @Version: V1.0 + */ +public interface ICarrentMileageService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/impl/CarrentMileageServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/impl/CarrentMileageServiceImpl.java new file mode 100644 index 0000000..626e877 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/impl/CarrentMileageServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.carrentMileage.service.impl; + +import org.jeecg.modules.carrentMileage.entity.CarrentMileage; +import org.jeecg.modules.carrentMileage.mapper.CarrentMileageMapper; +import org.jeecg.modules.carrentMileage.service.ICarrentMileageService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 公里数信息表 + * @Author: jeecg-boot + * @Date: 2024-12-26 + * @Version: V1.0 + */ +@Service +public class CarrentMileageServiceImpl extends ServiceImpl implements ICarrentMileageService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/CarrentMileageList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/CarrentMileageList.vue new file mode 100644 index 0000000..a1759cb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/CarrentMileageList.vue @@ -0,0 +1,171 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageForm.vue new file mode 100644 index 0000000..e35a24a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageForm.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue new file mode 100644 index 0000000..5d739c7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.vue new file mode 100644 index 0000000..24de20f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.api.ts new file mode 100644 index 0000000..cbdba11 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/carrentMileage/carrentMileage/list', + save='/carrentMileage/carrentMileage/add', + edit='/carrentMileage/carrentMileage/edit', + deleteOne = '/carrentMileage/carrentMileage/delete', + deleteBatch = '/carrentMileage/carrentMileage/deleteBatch', + importExcel = '/carrentMileage/carrentMileage/importExcel', + exportXls = '/carrentMileage/carrentMileage/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.data.ts new file mode 100644 index 0000000..bff7d54 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.data.ts @@ -0,0 +1,23 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '公里数(万)', + align:"center", + dataIndex: 'mileage' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '公里数(万)', + field: 'mileage', + component: 'InputNumber', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileageList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileageList.vue new file mode 100644 index 0000000..b84d830 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileageList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/components/CarrentMileageModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/components/CarrentMileageModal.vue new file mode 100644 index 0000000..927f941 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/components/CarrentMileageModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java index ecafa9b..7c27caa 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java @@ -37,12 +37,12 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; /** - * @Description: 个人信息表 + * @Description: 个人实名信息表 * @Author: jeecg-boot - * @Date: 2024-11-12 + * @Date: 2024-12-26 * @Version: V1.0 */ -@Api(tags="个人信息表") +@Api(tags="个人实名信息表") @RestController @RequestMapping("/carrentUser/carrentUser") @Slf4j @@ -59,8 +59,8 @@ public class CarrentUserController extends JeecgController> queryPageList(CarrentUser carrentUser, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -78,8 +78,8 @@ public class CarrentUserController extends JeecgController add(@RequestBody CarrentUser carrentUser) { carrentUserService.save(carrentUser); @@ -92,8 +92,8 @@ public class CarrentUserController extends JeecgController edit(@RequestBody CarrentUser carrentUser) { carrentUserService.updateById(carrentUser); @@ -106,8 +106,8 @@ public class CarrentUserController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { carrentUserService.removeById(id); @@ -120,8 +120,8 @@ public class CarrentUserController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.carrentUserService.removeByIds(Arrays.asList(ids.split(","))); @@ -134,8 +134,8 @@ public class CarrentUserController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { CarrentUser carrentUser = carrentUserService.getById(id); @@ -153,7 +153,7 @@ public class CarrentUserController extends JeecgController { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java index 15d14df..9de5c34 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java @@ -4,9 +4,9 @@ import org.jeecg.modules.carrentUser.entity.CarrentUser; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 个人信息表 + * @Description: 个人实名信息表 * @Author: jeecg-boot - * @Date: 2024-11-12 + * @Date: 2024-12-26 * @Version: V1.0 */ public interface ICarrentUserService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java index 7233369..61355da 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java @@ -8,9 +8,9 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: 个人信息表 + * @Description: 个人实名信息表 * @Author: jeecg-boot - * @Date: 2024-11-12 + * @Date: 2024-12-26 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue index 7a7e83c..b53a7d8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue @@ -12,7 +12,7 @@
新增 - 导出 + 导出 导入 @@ -109,7 +109,7 @@ }, data () { return { - description: '个人信息表管理页面', + description: '个人实名信息表管理页面', // 表头 columns: [ { @@ -143,6 +143,11 @@ dataIndex: 'cerImage', scopedSlots: {customRender: 'imgSlot'} }, + { + title:'状态', + align:"center", + dataIndex: 'status' + }, { title:'关联用户id', align:"center", @@ -186,6 +191,7 @@ fieldList.push({type:'string',value:'phone',text:'联系方式',dictCode:''}) fieldList.push({type:'string',value:'cerNo',text:'身份证号码',dictCode:''}) fieldList.push({type:'string',value:'cerImage',text:'身份证正面照',dictCode:''}) + fieldList.push({type:'string',value:'status',text:'状态',dictCode:'authentic_status'}) fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"}) this.superFieldList = fieldList } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue index ac016d9..6090d8f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue @@ -23,6 +23,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts index 8069601..de94e47 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts @@ -25,6 +25,11 @@ export const columns: BasicColumn[] = [ dataIndex: 'cerImage', customRender:render.renderAvatar, }, + { + title: '状态', + align:"center", + dataIndex: 'status' + }, { title: '关联用户id', align:"center", @@ -58,6 +63,11 @@ export const formSchema: FormSchema[] = [ componentProps:{ }, }, + { + label: '状态', + field: 'status', + component: 'Input', + }, { label: '关联用户id', field: 'userId', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUserList.vue index e172dbc..b711a1c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUserList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUserList.vue @@ -53,7 +53,7 @@ //注册table数据 const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ tableProps:{ - title: '个人信息表', + title: '个人实名信息表', api: list, columns, canResize:false, @@ -70,7 +70,7 @@ }, }, exportConfig: { - name:"个人信息表", + name:"个人实名信息表", url: getExportUrl, }, importConfig: { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java index 5af6465..4f83ff6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java @@ -12,10 +12,10 @@ public interface AppletLoginService { Result appletLogin(LoginReq loginReq); -// /** -// * 微信小程序登录绑定手机号码接口 -// * @param loginReq -// * @return -// */ -// Result bindPhone(LoginReq loginReq); + /** + * 微信小程序登录绑定手机号码接口 + * @param code + * @return + */ + Result bindPhone(String code); } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java index 235c6ad..e6ab2d6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java @@ -16,6 +16,12 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; @@ -106,6 +112,67 @@ public class AppletLoginServiceImpl implements AppletLoginService { return result; } + private static final String TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s"; + public String getAccessToken() throws Exception { + String requestUrl = String.format(TOKEN_URL, mpAppId, mpAppSecret); + URL url = new URL(requestUrl); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod("GET"); + + try (BufferedReader br = new BufferedReader( + new InputStreamReader(conn.getInputStream(), "UTF-8"))) { + StringBuilder response = new StringBuilder(); + String responseLine; + while ((responseLine = br.readLine()) != null) { + response.append(responseLine.trim()); + } + + org.json.JSONObject jsonResponse = new org.json.JSONObject(response.toString()); + return jsonResponse.getString("access_token"); + } + } + + private static final String API_URL = "https://api.weixin.qq.com/wxa/business/getuserphonenumber"; + public String getPhoneNumber(String code) throws Exception { + URL url = new URL(API_URL + "?access_token=" + this.getAccessToken()); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod("POST"); + conn.setRequestProperty("Content-Type", "application/json; utf-8"); + conn.setRequestProperty("Accept", "application/json"); + conn.setDoOutput(true); + + JSONObject jsonInput = new JSONObject(); + jsonInput.put("code", code); + + try (DataOutputStream os = new DataOutputStream(conn.getOutputStream())) { + byte[] input = jsonInput.toString().getBytes(StandardCharsets.UTF_8); + os.write(input, 0, input.length); + } + + try (BufferedReader br = new BufferedReader( + new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) { + StringBuilder response = new StringBuilder(); + String responseLine; + while ((responseLine = br.readLine()) != null) { + response.append(responseLine.trim()); + } + //获取手机号码 + return response.toString(); + } + } + + @Transactional(rollbackFor = Exception.class) + @Override + public Result bindPhone(String code) { + try { + String phoneNumber = this.getPhoneNumber(code); + return Result.OK(phoneNumber); + }catch (Exception e){ + return Result.error(e.getMessage()); + } + } + + // /** // * 微信小程序登录绑定手机号码接口 diff --git a/jeecg-boot-module-system/jeecg-boot-module-system.iml b/jeecg-boot-module-system/jeecg-boot-module-system.iml index 4a1bf6f..23022c4 100644 --- a/jeecg-boot-module-system/jeecg-boot-module-system.iml +++ b/jeecg-boot-module-system/jeecg-boot-module-system.iml @@ -163,6 +163,7 @@ + @@ -323,7 +324,6 @@ - diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java index 0a6e812..aba70c4 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java @@ -47,6 +47,12 @@ public class ConfigController { return configService.queryCatogoryTwoList(pageBean); } + @ApiOperation(value="配置信息-获取公里数列表", notes="配置信息-获取公里数列表") + @RequestMapping(value = "/queryMileageList", method = {RequestMethod.GET}) + public Result queryMileageList(){ + return configService.queryMileageList(); + } + @ApiOperation(value="配置信息-获取隐私政策", notes="配置信息-获取隐私政策") @RequestMapping(value = "/queryPrivacy", method = {RequestMethod.GET}) public Result queryPrivacy(){ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/LoginApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/LoginApiController.java index aa4016a..6fc852d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/LoginApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/LoginApiController.java @@ -30,20 +30,12 @@ public class LoginApiController { return loginApiService.login(loginReq); } -// //获取用户协议 -// @ApiOperation(value="小程序-获取用户协议", notes="小程序-获取用户协议") -// @GetMapping("/getUserAgreement") -// public Result getUserAgreement(){ -// return loginApiService.getUserAgreement(); -// } -// -// -// //获取隐私政策 -// @ApiOperation(value="小程序-获取隐私政策", notes="小程序-获取隐私政策") -// @GetMapping("/getPrivacyPolicy") -// public Result getPrivacyPolicy(){ -// return loginApiService.getPrivacyPolicy(); -// } + //绑定手机号码 + @ApiOperation(value="小程序-绑定手机号码", notes="小程序-绑定手机号码") + @GetMapping(value = "/bindPhone") + public Result bindPhone(String phoneCode){ + return loginApiService.bindPhone(phoneCode); + } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java index 914a815..fd1d948 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java @@ -26,15 +26,6 @@ public class UserController { private UserService userService; /****************************************************************************************************/ - @ApiOperation(value="用户信息-查询个人信息", notes="用户信息-查询个人信息") - @RequestMapping(value = "/queryUser", method = {RequestMethod.POST}) - public Result queryUser(@RequestHeader("X-Access-Token") String token){ - - String message = "查询个人信息失败"; - //注册信息验证 - return userService.queryUser(token); - } - @ApiOperation(value="用户信息-个人注册", notes="用户信息-个人注册") @RequestMapping(value = "/addUser", method = {RequestMethod.POST}) public Result addUser(@RequestHeader("X-Access-Token") String token, UserBean userBean){ @@ -65,34 +56,20 @@ public class UserController { return Result.error(message); } - @ApiOperation(value="用户信息-资料修改", notes="用户信息-资料修改") - @RequestMapping(value = "/updateUser", method = {RequestMethod.POST}) - public Result updateUser(@RequestHeader("X-Access-Token") String token, UserBean userBean){ - //将注册信息注入到实体bean中 - CarrentUser carrentUser = new CarrentUser(); - carrentUser.setId(userBean.getId()); - carrentUser.setName(userBean.getName()); - carrentUser.setCerNo(userBean.getCerNo()); - carrentUser.setPhone(userBean.getPhone()); - carrentUser.setCerImage(userBean.getCerImage()); + /*****************************************************************************************************************/ + //查看个人信息 - String message = ""; - //注册信息验证 - if(StringUtils.isEmpty(carrentUser.getName())){ - message = "用户姓名未填写，请填写用户姓名!"; - }else if(StringUtils.isEmpty(carrentUser.getCerNo())){ - message = "身份证号码未填写，请填写身份证号码!"; - }else if(StringUtils.isEmpty(carrentUser.getPhone())){ - message = "联系方式未填写，请填写联系方式!"; - }else if(StringUtils.isEmpty(carrentUser.getCerImage())){ - message = "身份证正面照片未填写，请上传身份证正面照片!"; - }else { - //注册信息无误，进入业务流程处理 - return userService.updateUser(token, carrentUser); - } + @ApiOperation(value="用户信息-查看个人信息", notes="用户信息-查看个人信息") + @RequestMapping(value = "/queryUser", method = {RequestMethod.GET}) + public Result queryUser(@RequestHeader("X-Access-Token") String token){ + return userService.queryUserInfo(token); + } - //注册信息有误，返回错误信息 - return Result.error(message); + //lzx：修改个人信息 + @ApiOperation(value="用户信息-修改个人信息", notes="用户信息-修改个人信息") + @RequestMapping(value = "/updateUser", method = {RequestMethod.POST}) + public Result updateUser(@RequestHeader("X-Access-Token") String token,String nickName,String phone,String headImage){ + return userService.updateUserInfo(token, nickName, phone, headImage); } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java index ab79070..5dffd81 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java @@ -9,6 +9,6 @@ public class WxQrCodeVo { @ApiModelProperty(value = "图片地址") private String url; - @ApiModelProperty(value = "加油站名称") + @ApiModelProperty(value = "小程序名称") private String name; } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java index 5641584..768a9a5 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java @@ -30,6 +30,12 @@ public interface ConfigService { */ public Result queryCatogoryTwoList(PageBean pageBean); + /** + *获取公里数列表 + * @return + */ + public Result queryMileageList(); + /** * * @return diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LoginApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LoginApiService.java index 338f385..8e95d61 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LoginApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LoginApiService.java @@ -7,9 +7,5 @@ public interface LoginApiService { //小程序-登录接口 Result login(LoginReq loginReq); - //获取用户协议 - Result getUserAgreement(); - - //获取隐私政策 - Result getPrivacyPolicy(); + public Result bindPhone(String phoneCode); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java index 857e66e..32bba20 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java @@ -6,27 +6,28 @@ import org.jeecg.modules.carrentUser.entity.CarrentUser; public interface UserService { /** - * 用户信息-查询个人信息 + * 用户信息-个人注册 * @param token + * @param carrentUser 用户信息 * @return */ - public Result queryUser(String token); + public Result addUser(String token, CarrentUser carrentUser); /** - * 用户信息-个人注册 + * 查询个人信息接口 * @param token - * @param carrentUser 用户信息 * @return */ - public Result addUser(String token, CarrentUser carrentUser); - + Result queryUserInfo(String token); /** - * 用户信息-资料修改 + * 修改个人信息接口 * @param token - * @param carrentUser 用户信息 + * @param nickName + * @param phone + * @param headImage * @return */ - public Result updateUser(String token, CarrentUser carrentUser); + Result updateUserInfo(String token,String nickName,String phone,String headImage); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java index 9afe9e0..1423461 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java @@ -26,33 +26,35 @@ public class CompanyServiceImpl implements CompanyService { //企业信息-企业注册 @Override public Result addCompany(String token, CarrentCompany carrentCompany) { - //返回信息 - String message = "企业注册失败"; - //执行结果 - boolean result = false; + String message = "企业实名注册操作失败"; //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - carrentCompany.setUserId(hanHaiMember.getId()); try{ - //执行企业注册 - result = carrentCompanyService.save(carrentCompany); - - //判断执行结果 - if(result){ - message = "企业注册成功！"; + //查询企业信息 + CarrentCompany company = carrentCompanyService + .lambdaQuery() + .eq(CarrentCompany::getUserId, hanHaiMember.getId()) + .one(); + //如果存在则修改信息 + if(null != company){ + if(!"1".equals(company.getStatus())){ + company.setId(company.getId()); + company.setStatus("0"); + carrentCompanyService.updateById(company); + message = "企业实名注册修改成功！"; + }else { + message = "审核已通过，不能修改！"; + } }else { - message = "企业注册失败！"; + company.setUserId(hanHaiMember.getId()); + boolean result = carrentCompanyService.save(company); + message = "企业实名注册添加成功！"; } - - //返回执行结果 return Result.OK(message); - }catch (Exception e){ - //错误信息打印 e.printStackTrace(); return Result.error(message); } - } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java index 3ecb0d1..eb22c77 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java @@ -11,6 +11,8 @@ import org.jeecg.modules.carrentCategorytwo.entity.CarrentCategorytwo; import org.jeecg.modules.carrentCategorytwo.service.ICarrentCategorytwoService; import org.jeecg.modules.carrentConfig.entity.CarrentConfig; import org.jeecg.modules.carrentConfig.service.ICarrentConfigService; +import org.jeecg.modules.carrentMileage.entity.CarrentMileage; +import org.jeecg.modules.carrentMileage.service.ICarrentMileageService; import org.jeecg.modules.carrentOrder.entity.CarrentOrder; import org.jeecg.modules.carrentType.entity.CarrentType; import org.jeecg.modules.carrentType.service.ICarrentTypeService; @@ -24,6 +26,10 @@ import java.util.List; public class ConfigServiceImpl implements ConfigService { /*************************************************************************************/ + //公里数信息 + @Resource + private ICarrentMileageService carrentMileageService; + //商品类型 @Resource private ICarrentTypeService carrentTypeService; @@ -176,6 +182,31 @@ public class ConfigServiceImpl implements ConfigService { } + //配置信息-获取商品二级分类列表 + @Override + public Result queryMileageList() { + //返回信息 + String message = "公里数列表查询失败!"; + //公里数列表 + List mileageList = new ArrayList<>(); + + try{ + + mileageList = carrentMileageService + .lambdaQuery() + .orderByAsc(CarrentMileage::getMileage) + .list(); + message = "公里数列表"; + //返回执行结果 + return Result.OK(message, mileageList); + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message, mileageList); + } + + } + //获取隐私政策 @Override public Result queryPrivacy() { diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java index 01a37a8..9985048 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java @@ -20,20 +20,9 @@ public class LoginApiServiceImpl implements LoginApiService { return appletLoginService.appletLogin(loginReq); } - - //小程序-获取用户协议 - @Override - public Result getUserAgreement() - { - - return Result.OK("用户协议"); - } - - //获取隐私政策 + //微信小程序登录绑定手机号码接口 @Override - public Result getPrivacyPolicy() - { - - return Result.OK("隐私政策"); + public Result bindPhone(String phoneCode) { + return appletLoginService.bindPhone(phoneCode); } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java index 48349b0..5ada6df 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java @@ -46,6 +46,7 @@ public class RecommendServiceImpl implements RecommendService { private String accessKey = "LTAI5tPfZo39q2r9Sr5mW84u"; private String secretKey = "XxExGallsV4O9nERHpVsQg2XtPCU7r"; private String bucketName = "augcl"; + private String staticDomain = "https://img.augcl.com/"; /*************************************************************************************/ //获取个人推荐二维码 @@ -139,8 +140,7 @@ public class RecommendServiceImpl implements RecommendService { MultipartFile mf = new CommonsMultipartFile(item); //返回图片下载地址 WxQrCodeVo wxCodeVo = new WxQrCodeVo(); - wxCodeVo.setUrl(this.uploadAliYunOss(mf)); - + wxCodeVo.setUrl(staticDomain+this.uploadAliYunOss(mf)); wxCodeVo.setName("老环卫欢迎您"); return Result.OK(wxCodeVo); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java index 4e01263..06eceff 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java @@ -1,14 +1,22 @@ package org.jeecg.modules.apiService.impl; +import com.alipay.api.domain.Car; +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiService.UserService; +import org.jeecg.modules.carrentCompany.entity.CarrentCompany; +import org.jeecg.modules.carrentCompany.service.ICarrentCompanyService; import org.jeecg.modules.carrentUser.entity.CarrentUser; import org.jeecg.modules.carrentUser.service.ICarrentUserService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class UserServiceImpl implements UserService { @@ -20,126 +28,132 @@ public class UserServiceImpl implements UserService { //个人信息 @Resource + private IHanHaiMemberService hanHaiMemberService; + + //个人注册信息 + @Resource private ICarrentUserService carrentUserService; - /*************************************************************************************/ - //用户信息-根据id查询个人信息 + //企业注册信息 + @Resource + private ICarrentCompanyService carrentCompanyService; + /*************************************************************************************/ + //用户信息-个人注册 @Override - public Result queryUser(String token) { + public Result addUser(String token, CarrentUser carrentUser) { //返回信息 - String message = "查询失败"; + String message = "个人注册失败！"; //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); try{ - //执行查询 - CarrentUser user = carrentUserService - .lambdaQuery() + //查询实名认证信息 + CarrentUser user = carrentUserService.lambdaQuery() .eq(CarrentUser::getUserId, hanHaiMember.getId()) .one(); - if(null == user){ - return Result.error("该用户未进行个人注册，请先进行个人注册"); + + //判断用户是否已实名认证通过 + CarrentUser cerNo = carrentUserService.lambdaQuery() + .eq(CarrentUser::getCerNo, user.getCerNo()) + .eq(CarrentUser::getStatus, "1") + .one(); + + if(null != cerNo){ + return Result.error("该身份证已认证过，不能重复使用！"); } - //判断执行结果 + + //如果存在则修改信息 if(null != user){ - message = "个人信息！"; + if(!"1".equals(user.getStatus())){ + user.setId(user.getId()); + user.setStatus("0"); + carrentUserService.updateById(user); + message = "个人实名注册修改成功！"; + }else { + message = "审核已通过，不能修改！"; + } }else { - message = "没有查询到用户信息！"; + user.setUserId(hanHaiMember.getId()); + boolean result = carrentUserService.save(user); + message = "个人实名注册添加成功！"; } - - //返回执行结果 - return Result.OK(message, user); - + return Result.OK(message); }catch (Exception e){ - //错误信息打印 e.printStackTrace(); - return Result.OK(message); + return Result.error(message); } } - //用户信息-个人注册 + /******************************************************************************************************************/ + //查询个人信息 @Override - public Result addUser(String token, CarrentUser carrentUser) { - //返回信息 - String message = "个人注册失败"; - //执行结果 - boolean result = false; + public Result queryUserInfo(String token){ //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - carrentUser.setUserId(hanHaiMember.getId()); + //返回信息 + Map map = new HashMap(); try{ + //用户信息 + HanHaiMember member = hanHaiMemberService.getById(hanHaiMember.getId()); + map.put("memberInfo", member); - //判断是否重复注册 - CarrentUser user = carrentUserService + //获取个人实名信息 + CarrentUser personAuthenticationStatus = carrentUserService .lambdaQuery() .eq(CarrentUser::getUserId, hanHaiMember.getId()) .one(); - if(null != user){ - return Result.error("该用户已注册个人信息，请勿重复注册"); + if(null != personAuthenticationStatus){ + map.put("personAuthenticationStatus",personAuthenticationStatus.getStatus());//个人实名状态 + }else { + map.put("personAuthenticationStatus","-1");//个人实名状态 } - //执行个人注册 - result = carrentUserService.save(carrentUser); - - //判断执行结果 - if(result){ - message = "个人注册成功！"; + //获取企业实名信息 + CarrentCompany company = carrentCompanyService + .lambdaQuery() + .eq(CarrentCompany::getUserId, hanHaiMember.getId()) + .one(); + if(null != company){ + map.put("companyAuthenticationStatus",company.getStatus());//企业实名状态 }else { - message = "个人注册失败！"; + map.put("companyAuthenticationStatus","-1");//企业实名状态 } - //返回执行结果 - return Result.OK(message); + return Result.OK("用户信息", map); }catch (Exception e){ - //错误信息打印 e.printStackTrace(); - return Result.OK(message); + return Result.error("用户信息获取失败", null); } - } - //用户信息-资料修改 + //修改个人信息 @Override - public Result updateUser(String token, CarrentUser carrentUser) { - //返回信息 - String message = ""; - //执行结果 - boolean result = false; + public Result updateUserInfo(String token,String nickName,String phone,String headImage){ //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); try{ - CarrentUser user = carrentUserService - .lambdaQuery() - .eq(CarrentUser::getUserId, hanHaiMember.getId()) - .one(); - if(null == user){ - return Result.error("该用户还未进行个人注册，请先去进行个人注册"); + //用户昵称不能为空 + if(StringUtils.isBlank(nickName)){ + return Result.error("用户昵称不能为空"); } - - //执行资料修改 - carrentUser.setId(user.getId()); - carrentUser.setUserId(hanHaiMember.getId()); - result = carrentUserService.updateById(carrentUser); - - //判断执行结果 - if(result){ - message = "个人资料修改成功！"; - }else { - message = "个人资料修改失败！"; + if(StringUtils.isBlank(headImage)){ + return Result.error("头像不能为空"); } - //返回执行结果 - return Result.OK(message); + hanHaiMember.setNickName(nickName); + hanHaiMember.setPhone(phone); + hanHaiMember.setHeadImage(headImage); + hanHaiMemberService.updateById(hanHaiMember); + return Result.OK("修改成功"); }catch (Exception e){ - //错误信息打印 e.printStackTrace(); - return Result.error(message); + return Result.error("修改失败"); } - } + }