Merge remote-tracking branch 'origin/bingx' into bingx

zj

2025-05-02 01830e44921b187b448d8cce9c9a46b9ad55af43

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
package project.tip.web;
 
import java.util.HashMap;
import java.util.Map;
 
import kernel.util.JsonUtils;
import kernel.util.StringUtils;
import project.tip.TipService;
import security.web.BaseSecurityAction;
 
public class AdminTipAction extends BaseSecurityAction {
    
    private String model;
    
    private Long time_stamp;
    
    private String result_make;
    
    private TipService tipService;
    
    public String getTips() {
        if (!StringUtils.isNullOrEmpty(getLoginPartyId())) {
            return "result_make";
        }
        Map<String, Object> result = new HashMap<String, Object>();
        result.put("tipList", tipService.cacheSumTips(this.getUsername_login()));
 
        this.result_make = JsonUtils.getJsonString(result);
        return "result_make";
    }
 
    public String getNewTips() {
        if (!StringUtils.isNullOrEmpty(getLoginPartyId())) {
            return "result_make";
        }
        Map<String, Object> result = new HashMap<String, Object>();
        if (!StringUtils.isNullOrEmpty(model)) {
            result.put("tipList", tipService.cacheNewTipsByModel(this.getUsername_login(), time_stamp, model));
        } else {
            result.put("tipList", tipService.cacheNewTips(this.getUsername_login(), time_stamp));
        }
 
        this.result_make = JsonUtils.getJsonString(result);
        return "result_make";
    }
 
    public String getResult_make() {
        return result_make;
    }
 
    public void setTipService(TipService tipService) {
        this.tipService = tipService;
    }
 
    public void setTime_stamp(Long time_stamp) {
        this.time_stamp = time_stamp;
    }
 
    public void setModel(String model) {
        this.model = model;
    }
}