diff --git a/src/main/java/cn/com/tenlion/controller/api/applyconfig/ApplyConfigController.java b/src/main/java/cn/com/tenlion/controller/api/applyconfig/ApplyConfigController.java new file mode 100644 index 0000000..d6e5f85 --- /dev/null +++ b/src/main/java/cn/com/tenlion/controller/api/applyconfig/ApplyConfigController.java @@ -0,0 +1,58 @@ +package cn.com.tenlion.controller.api.applyconfig; + + +import cn.com.tenlion.pojo.vos.apply.ApplyVO; +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.interfaces.manager.ISystemConfigManager; +import ink.wgink.login.base.manager.ConfigManager; +import ink.wgink.login.base.service.config.IConfigService; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** + * @ClassName: ApplyController + * @Description: 报名配置 + * @Author: CodeFactory + * @Date: 2021-05-01 18:49:41 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "报名配置接口") +@RestController +@RequestMapping(ISystemConstant.API_PREFIX + "/applyconfig") +public class ApplyConfigController { + + + @Autowired + private IConfigService configService; + + + @ApiOperation(value = "修改报名信息", notes = "修改报名信息接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "applyId", value = "报名信息ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update") + @CheckRequestBodyAnnotation + public SuccessResult update(@RequestBody Map params) { + configService.updateConfig("",params.get("")); + configService.updateConfig("",params.get("")); + configService.updateConfig("",params.get("")); + return new SuccessResult(); + } + + + +// public void a (){ +// ConfigManager.getInstance().getConfig(). +// } + + + + +} diff --git a/src/main/java/cn/com/tenlion/controller/app/route/trainingInstitution/TrainingInstitutionRouteController.java b/src/main/java/cn/com/tenlion/controller/app/route/trainingInstitution/TrainingInstitutionRouteController.java index b341d5c..85857fc 100644 --- a/src/main/java/cn/com/tenlion/controller/app/route/trainingInstitution/TrainingInstitutionRouteController.java +++ b/src/main/java/cn/com/tenlion/controller/app/route/trainingInstitution/TrainingInstitutionRouteController.java @@ -1,8 +1,10 @@ package cn.com.tenlion.controller.app.route.trainingInstitution; import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.properties.ServerProperties; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -15,12 +17,16 @@ import org.springframework.web.servlet.ModelAndView; @RequestMapping(ISystemConstant.APP_ROUTE_PREFIX + "/traininginstitutionroute") public class TrainingInstitutionRouteController { + @Autowired + private ServerProperties serverProperties; - @ApiOperation(value = "角色统计页面", notes = "角色统计页面接口") + + @ApiOperation(value = "机构二维码查看页面", notes = "机构二维码查看页面接口") @GetMapping("get-qrcode-view/{institutionId}") public ModelAndView getqrCodeView(@PathVariable("institutionId") String institutionId){ ModelAndView mv = new ModelAndView("trainingInstitution/qrcode-view"); mv.addObject("institutionId",institutionId); + mv.addObject("systemUrl",serverProperties.getUrl()); return mv; } } diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java index d37c3f4..783382e 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java @@ -16,7 +16,7 @@ public class ApplyWorkTypeInstitutionDTO extends InstitutionDTO { private Integer applyUserNum2; @ApiModelProperty(name = "applyUserNum3", value = "已通过审核人数") private Integer applyUserNum3; - @ApiModelProperty(name = "QrCode", value = "机构二维码") + @ApiModelProperty(name = "qrCode", value = "机构二维码") private String qrCode; @ApiModelProperty(name = "applyStatus", value = "是否可以进行报名 true 可以 false 不可以") private boolean applyStatus; diff --git a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java index 110055c..6833837 100644 --- a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java @@ -32,6 +32,7 @@ import ink.wgink.pojo.ListPage; import ink.wgink.pojo.app.AppTokenUser; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.properties.ServerProperties; import ink.wgink.service.user.pojo.vos.UserVO; import ink.wgink.service.user.service.IUserService; import ink.wgink.util.QRCodeUtil; @@ -81,6 +82,11 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic private IUserService userService; @Value("${user.default-password:" + ISystemConstant.DEFAULT_PASSWORD + "}") private String defaultPassword; + @Autowired + private ServerProperties serverProperties; + + + private ISystemConfigManager systemConfigManager; @@ -163,7 +169,7 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic if(applyDTO.getApplyAuditState() != 0){ throw new SearchException("报名信息已审核"); } - if(!examCheckService.getExamCheck(applyDTO.getApplyWorkTypeId(),applyDTO.getApplyInstitutionId())){ + if(!examCheckService.getExamCheckFailOrBack(applyDTO.getApplyWorkTypeId(),applyDTO.getApplyInstitutionId())){ throw new SaveException("该人员报名的班级已提交开班审核"); } @@ -244,16 +250,17 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic }else{ trainingInstitutionWorkTypeDTO.setApplyStatus(examCheckService.getExamCheck(workTypeId,row.getInstitutionId())); } - trainingInstitutionWorkTypeDTO.setQrCode("123"); + trainingInstitutionWorkTypeDTO.setQrCode(createQrCode(row.getInstitutionId())); list.add(trainingInstitutionWorkTypeDTO); } return new SuccessResultList<>(list, trainingInstitutionWorkTypeList.getPage(), trainingInstitutionWorkTypeList.getTotal()); } - public String createQrCode(String iId) throws Exception{ + public String createQrCode(String id) throws Exception{ + String content = serverProperties.getUrl()+"/approute/traininginstitutionroute/get-qrcode-view/"+id; ByteArrayOutputStream stream = new ByteArrayOutputStream(); - ImageIO.write(QRCodeUtil.createQrCode(60,60,"12313",null), "png", stream); + ImageIO.write(QRCodeUtil.createQrCode(150,150,content,null), "png", stream); // 对字节数组Base64编码 Base64 base = new Base64(); String base64 = base.encodeToString(stream.toByteArray()); diff --git a/src/main/resources/static/assets/qrcodeview/css/style.css b/src/main/resources/static/assets/qrcodeview/css/style.css index 8bdc155..0bb03a7 100644 --- a/src/main/resources/static/assets/qrcodeview/css/style.css +++ b/src/main/resources/static/assets/qrcodeview/css/style.css @@ -5,4 +5,8 @@ p{ font-size: .32rem; color: #000; line-height: .6rem; +} +img{ + width: 100%; + margin-bottom: .3rem; } \ No newline at end of file diff --git a/src/main/resources/static/route/applyconfig/show.html b/src/main/resources/static/route/applyconfig/show.html new file mode 100644 index 0000000..1e8ecea --- /dev/null +++ b/src/main/resources/static/route/applyconfig/show.html @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + +
+
+
+
+
+
+ + 开班人数设置 + +
+
+
+
+ +
+
人数
+
+
+
+
+
+ + 开班自动报备小时设置 + +
+
+
+
+ +
+
小时
+
+
+
+
+
+ + 未开班人数不变提醒天数 + +
+
+
+
+ +
+
天数
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/trainingInstitution/qrcode-view.html b/src/main/resources/templates/trainingInstitution/qrcode-view.html index a213d50..45f126e 100644 --- a/src/main/resources/templates/trainingInstitution/qrcode-view.html +++ b/src/main/resources/templates/trainingInstitution/qrcode-view.html @@ -6,38 +6,45 @@ 安全生产三项人员考试服务平台 +
+ +

机构名称:{{orgInfo.institutionName}}

机构地址:{{orgInfo.institutionAddress}}

机构简介:{{orgInfo.institutionDesc}}

负责人：{{orgInfo.institutionPrincipal}}

联系方式：{{orgInfo.institutionContact}}

+
- - - + + +