diff --git a/game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java b/game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java index 47425452..c0b08aba 100644 --- a/game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java +++ b/game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java @@ -1,11 +1,9 @@ package com.ccsens.game.bean.vo; -import com.ccsens.game.bean.po.GameUserJoin; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; import java.util.List; @Data @@ -13,7 +11,7 @@ public class ScreenVo { @Data @ApiModel public static class UrlVo{ - @ApiModelProperty("大屏的路径") + @ApiModelProperty("游戏的id") private Long id; @ApiModelProperty("大屏的路径") private String url; diff --git a/pims/src/main/java/com/ccsens/pims/bean/dto/CompanyDto.java b/pims/src/main/java/com/ccsens/pims/bean/dto/CompanyDto.java index 9a218a31..ca089146 100644 --- a/pims/src/main/java/com/ccsens/pims/bean/dto/CompanyDto.java +++ b/pims/src/main/java/com/ccsens/pims/bean/dto/CompanyDto.java @@ -18,9 +18,8 @@ public class CompanyDto { @NotNull @ApiModelProperty("项目id") private Long projectId; -// @NotNull -// @ApiModelProperty("任务id") -// private Long taskId; + @ApiModelProperty("任务id") + private int year; } @Data @@ -40,7 +39,7 @@ public class CompanyDto { } @Data - @ApiModel("异步通知") + @ApiModel public static class Async{ @NotNull @ApiModelProperty("文件ID") diff --git a/pims/src/main/java/com/ccsens/pims/service/RealExcelService.java b/pims/src/main/java/com/ccsens/pims/service/RealExcelService.java index f656e45e..15b12190 100644 --- a/pims/src/main/java/com/ccsens/pims/service/RealExcelService.java +++ b/pims/src/main/java/com/ccsens/pims/service/RealExcelService.java @@ -230,7 +230,7 @@ public class RealExcelService implements IRealExcelService { predictIncome = new BigDecimal(predictIncomeCell).multiply(BigDecimal.valueOf(100)).longValue(); } long realIncome = 0; - XSSFRow realRow = sheet.getRow(i); + XSSFRow realRow = sheet.getRow(i + 1); if(ObjectUtil.isNotNull(realRow)){ String realIncomeCell = ExcelUtil.getCellValue(realRow.getCell(a)); if(StrUtil.isNotEmpty(realIncomeCell)) { @@ -254,19 +254,19 @@ public class RealExcelService implements IRealExcelService { @Override public void realCost(CompanyDto.Async params) throws Exception { -// log.info("wps文件id:{}", params.toString()); -// Long wpsId = params.getFileId(); -// JsonResponse businessFileIdAndPath = tallFeignClient.getPathByWpsId(wpsId); -// log.info("获取文件路径和项目id:{}", businessFileIdAndPath.toString()); -// if (ObjectUtil.isNull(businessFileIdAndPath)) {return;} -// WpsVo.BusinessFileIdAndPath fileIdAndPath = businessFileIdAndPath.getData(); -// if (ObjectUtil.isNull(fileIdAndPath)) {return;} -// //项目id -// long projectId = fileIdAndPath.getBusinessId(); -// //文件路径 -// String path = fileIdAndPath.getFilePath(); - long projectId = 1289087369240252416L; - String path = "C:\\Users\\逗\\Desktop\\产品成本费用估算表.xlsx"; + log.info("wps文件id:{}", params.toString()); + Long wpsId = params.getFileId(); + JsonResponse businessFileIdAndPath = tallFeignClient.getPathByWpsId(wpsId); + log.info("获取文件路径和项目id:{}", businessFileIdAndPath.toString()); + if (ObjectUtil.isNull(businessFileIdAndPath)) {return;} + WpsVo.BusinessFileIdAndPath fileIdAndPath = businessFileIdAndPath.getData(); + if (ObjectUtil.isNull(fileIdAndPath)) {return;} + //项目id + long projectId = fileIdAndPath.getBusinessId(); + //文件路径 + String path = fileIdAndPath.getFilePath(); +// long projectId = 1289087369240252416L; +// String path = "C:\\Users\\逗\\Desktop\\产品成本费用估算表.xlsx"; //获取excel文件 InputStream is = new FileInputStream(path); diff --git a/pims/src/main/resources/mapper_dao/ProducrDao.xml b/pims/src/main/resources/mapper_dao/ProducrDao.xml index 88b55228..76988004 100644 --- a/pims/src/main/resources/mapper_dao/ProducrDao.xml +++ b/pims/src/main/resources/mapper_dao/ProducrDao.xml @@ -271,6 +271,7 @@ p.rec_status = 0 AND pt.project_id = #{projectId} + ORDER BY p.gross_margin DESC + + + \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java index 41199180..1bb18dd2 100644 --- a/util/src/main/java/com/ccsens/util/PoiUtil.java +++ b/util/src/main/java/com/ccsens/util/PoiUtil.java @@ -162,6 +162,7 @@ public class PoiUtil { font.setColor(Font.COLOR_RED); style.setFont(font); } + style.setFillForegroundColor(IndexedColors.RED.getIndex()); newCell.setCellStyle(style); } } @@ -443,7 +444,6 @@ public class PoiUtil { } /** * - * @param ImgPath:图片路径 * @param row1:起始行 * @param row2:终止行 * @param col1:起始列 @@ -493,19 +493,27 @@ public class PoiUtil { } public static void main(String[] args) throws Exception { + InputStream inputStream = new FileInputStream("D:\\1.xlsx"); + Workbook workbook = new XSSFWorkbook(inputStream); + workbook.removeSheetAt(workbook.getSheetIndex("bbb")); + + OutputStream stream = new FileOutputStream(new File("D:\\1.xlsx")); + workbook.write(stream); + stream.close(); // List> list = new ArrayList<>(); // List cells = new ArrayList<>(); -// cells.add(new PoiUtilCell("1", 5, 1)); +// cells.add(new PoiUtilCell("1", 2, 1)); // cells.add(new PoiUtilCell()); // cells.add(new PoiUtilCell()); // cells.add(new PoiUtilCell()); // cells.add(new PoiUtilCell()); // cells.add(new PoiUtilCell("2")); // list.add(cells); -// List cells2 = new ArrayList<>(); +// List cells2 = new ArrayList<>(); // cells2.add(new PoiUtilCell("3", 1, 2)); // cells2.add(new PoiUtilCell("4")); +// cells2.add(new PoiUtilCell("",3,1)); // list.add(cells2); // List cells3 = new ArrayList<>(); // cells3.add(new PoiUtilCell("5")); @@ -517,8 +525,8 @@ public class PoiUtil { // cells5.add(new PoiUtilCell("9", 2, 2)); // cells5.add(new PoiUtilCell("9")); // list.add(cells5); -// -// Workbook wbs = exportWB("wbs", list, null); + +// Workbook wbs = exportWB("wbs", list, workbook); // OutputStream stream = new FileOutputStream(new File("D:\\1.xlsx")); // wbs.write(stream); // stream.close(); diff --git a/util/src/main/java/com/ccsens/util/PropUtil.java b/util/src/main/java/com/ccsens/util/PropUtil.java index 6e89a830..72a2dff1 100644 --- a/util/src/main/java/com/ccsens/util/PropUtil.java +++ b/util/src/main/java/com/ccsens/util/PropUtil.java @@ -20,6 +20,7 @@ public class PropUtil { public static String notGatewayUrl; public static String qrCode; public static String wxPrefix; + public static String smsCode; @Value("${gatewayUrl:}") public void setGatewayUrl(String gatewayUrl) { @@ -58,4 +59,8 @@ public class PropUtil { public void setWxPrefix(String wxPrefix) { PropUtil.wxPrefix = wxPrefix; } + @Value("${smsCode:}") + public void setSmsCode(String smsCode) { + PropUtil.smsCode = smsCode; + } } diff --git a/util/src/main/java/com/ccsens/util/SmsUtil.java b/util/src/main/java/com/ccsens/util/SmsUtil.java index d59dd72f..53147ad3 100644 --- a/util/src/main/java/com/ccsens/util/SmsUtil.java +++ b/util/src/main/java/com/ccsens/util/SmsUtil.java @@ -12,20 +12,32 @@ import java.io.IOException; @Slf4j @Component public class SmsUtil { - private static final int appid = 1400188778; // 1400开头 + // 1400开头 + private static final int appid = 1400188778; private static final String appkey = "c86ca104521ab2e28e1d4b558fdd665e"; - private static final int templateId = 286731; //{1} 验证码{1}, 您正在通过{2}登录传控科技“时物链条”会议管理系统,请与{3}分钟内填写,如非本人操作,请忽略本短信。 - private static final int templateId1 = 286682; //{1} 您正在通过{2}登录传控科技“时物链条”会议管理系统,请与{2}分钟内填写,如非本人操作,请忽略本短信。 + /** + * {1} 验证码{1}, 您正在通过{2}登录传控科技“时物链条”会议管理系统,请与{3}分钟内填写,如非本人操作,请忽略本短信。\ + */ + private static final int templateId = 286731; + /** + * {1} 您正在通过{2}登录传控科技“时物链条”会议管理系统,请与{2}分钟内填写,如非本人操作,请忽略本短信。 + */ + private static final int templateId1 = 286682; + /**验证码{1},{2}分钟内有效,如非本人操作请忽略 + * + */ + private static final int templateId2 = 686476; private static final String smsSign = "传控科技"; public static void sendSms(String phone,String code,String appName,Integer seconds){ String phoneNumbers[] = {phone}; Integer minutes = (seconds - 1) / 60 + 1; try { - String[] params = {code,appName,String.valueOf(minutes)};//数组具体的元素个数和模板中变量个数必须一致,例如事例中templateId:5678对应一个变量,参数数组中元素个数也必须是一个 - SmsSingleSender ssender = new SmsSingleSender(appid, appkey); + //数组具体的元素个数和模板中变量个数必须一致,例如事例中templateId:5678对应一个变量,参数数组中元素个数也必须是一个 + String[] params = {code,String.valueOf(minutes)}; SmsSingleSender ssender = new SmsSingleSender(appid, appkey); + // 签名参数未提供或者为空时,会使用默认签名发送短信 SmsSingleSenderResult result = ssender.sendWithParam("86", phoneNumbers[0], - templateId, params, smsSign, "", ""); // 签名参数未提供或者为空时,会使用默认签名发送短信 + templateId2, params, smsSign, "", ""); log.info(String.valueOf(result)); } catch (HTTPException e) { // HTTP响应码错误 diff --git a/util/src/main/java/com/ccsens/util/WebConstant.java b/util/src/main/java/com/ccsens/util/WebConstant.java index fd262b70..c8855839 100644 --- a/util/src/main/java/com/ccsens/util/WebConstant.java +++ b/util/src/main/java/com/ccsens/util/WebConstant.java @@ -506,7 +506,8 @@ public class WebConstant { // } public enum Message_Type{ - Heart(0x00,"Heart"),Ack(0x01,"Ack"),Auth(0x02,"Auth"),Channel(0x03,"Channel"),Sync(0x04,"Sync") + Heart(0x00,"Heart"),Ack(0x01,"Ack"),Auth(0x02,"Auth"),Channel(0x03,"Channel") + ,Sync(0x04,"Sync") ,Node(0x05,"Node"),User(0x06,"User"), Timer(0x07,"Timer") ,Error(0x99,"Error") ,MasterStatus(0x10,"MasterStatus")