胡翰林 / ash · Commits

Commit 6652e9f6c96950cf42f9bb4ae960ae9d493c6160

Authored by 胡翰林
1 parent fd7d9dc1

去除饼图阴影 获取下一条数据接口修改

Inline Side-by-side
Showing 4 changed files with 22 additions and 3 deletions
@@ -99,7 +99,7 @@ public class CaseController extends BaseController { @@ -99,7 +99,7 @@ public class CaseController extends BaseController {
99 try { 99 try {
100 List<String> dataList = caseService.listUnReview(data.getExceptIds()); 100 List<String> dataList = caseService.listUnReview(data.getExceptIds());
101 if (CollectionUtils.isEmpty(dataList)) { 101 if (CollectionUtils.isEmpty(dataList)) {
102 - return new JsonResult(false, AshErrorCode.NEXT_DATA_EMPTY.getText(), null); 102 + return new JsonResult(true, AshErrorCode.NEXT_DATA_EMPTY.getText(), null);
103 } 103 }
104 return new JsonResult(true, OptionStatus.OPT_SUCCESS.getName(), dataList.get(0)); 104 return new JsonResult(true, OptionStatus.OPT_SUCCESS.getName(), dataList.get(0));
105 } catch (Exception ex) { 105 } catch (Exception ex) {
@@ -106,7 +106,7 @@ public class WarningInstanceController extends BaseController { @@ -106,7 +106,7 @@ public class WarningInstanceController extends BaseController {
106 try { 106 try {
107 List<String> dataList = warningInstanceService.listUnReview(warningInstance.getExceptIds()); 107 List<String> dataList = warningInstanceService.listUnReview(warningInstance.getExceptIds());
108 if (CollectionUtils.isEmpty(dataList)) { 108 if (CollectionUtils.isEmpty(dataList)) {
109 - return new JsonResult(false, AshErrorCode.NEXT_DATA_EMPTY.getText(), null); 109 + return new JsonResult(true, AshErrorCode.NEXT_DATA_EMPTY.getText(), null);
110 } 110 }
111 return new JsonResult(true, OptionStatus.OPT_SUCCESS.getName(), dataList.get(0)); 111 return new JsonResult(true, OptionStatus.OPT_SUCCESS.getName(), dataList.get(0));
112 } catch (Exception ex) { 112 } catch (Exception ex) {
@@ -42,6 +42,16 @@ public class JFCTest { @@ -42,6 +42,16 @@ public class JFCTest {
42 PieChartVo d5 = new PieChartVo("类型5", 10.2); 42 PieChartVo d5 = new PieChartVo("类型5", 10.2);
43 PieChartVo d6 = new PieChartVo("类型6", -10.2); 43 PieChartVo d6 = new PieChartVo("类型6", -10.2);
44 PieChartVo d7 = new PieChartVo("类型7", 20.2); 44 PieChartVo d7 = new PieChartVo("类型7", 20.2);
  45 + PieChartVo d8 = new PieChartVo("类型8", 20.2);
  46 + PieChartVo d9 = new PieChartVo("类型9", 20.2);
  47 + PieChartVo d10 = new PieChartVo("类型10", 20.2);
  48 + PieChartVo d11 = new PieChartVo("类型11", 20.2);
  49 + PieChartVo d12 = new PieChartVo("类型12", 20.2);
  50 + PieChartVo d13 = new PieChartVo("类型13", 20.2);
  51 + PieChartVo d14 = new PieChartVo("类型14", 20.2);
  52 + PieChartVo d15 = new PieChartVo("类型15", 20.2);
  53 + PieChartVo d16 = new PieChartVo("类型16", 20.2);
  54 +
45 55
46 dataList.add(d1); 56 dataList.add(d1);
47 dataList.add(d2); 57 dataList.add(d2);
@@ -49,7 +59,15 @@ public class JFCTest { @@ -49,7 +59,15 @@ public class JFCTest {
49 dataList.add(d4); 59 dataList.add(d4);
50 dataList.add(d5); 60 dataList.add(d5);
51 dataList.add(d6); 61 dataList.add(d6);
52 - dataList.add(d7); 62 + dataList.add(d8);
  63 + dataList.add(d9);
  64 + dataList.add(d10);
  65 + dataList.add(d11);
  66 + dataList.add(d12);
  67 + dataList.add(d13);
  68 + dataList.add(d14);
  69 + dataList.add(d15);
  70 + dataList.add(d16);
53 getWord(dataList); 71 getWord(dataList);
54 } 72 }
55 73
@@ -116,6 +116,7 @@ public class JFChartUtils { @@ -116,6 +116,7 @@ public class JFChartUtils {
116 // 设置无数据信息字体（如果需要） 116 // 设置无数据信息字体（如果需要）
117 plot.setNoDataMessageFont(new Font("宋体", Font.PLAIN, 18)); 117 plot.setNoDataMessageFont(new Font("宋体", Font.PLAIN, 18));
118 plot.setNoDataMessage("暂无数据"); 118 plot.setNoDataMessage("暂无数据");
  119 + plot.setShadowPaint(Color.WHITE);
119 plot.setLabelGenerator(new StandardPieSectionLabelGenerator( 120 plot.setLabelGenerator(new StandardPieSectionLabelGenerator(
120 "{2}", 121 "{2}",
121 new DecimalFormat("#,##0"), // 数值格式（带千分位） 122 new DecimalFormat("#,##0"), // 数值格式（带千分位）